Merge ~kzapalowicz/snappy-hwe-snaps/+git/udisks2:feature/automount-on-boot into ~snappy-hwe-team/snappy-hwe-snaps/+git/udisks2:master

[Konrad Zapałowicz]

ciborium: wait till the GetManagedObjects interface is ready

At certain systems it has been observed that although the
org.freedesktop.UDisks2 name is registered the ObjectManager interface
is not immediately ready. As a result the "GetManagedObjects" call fails
and the cold-plugged usb devices not reported.

This commit implements behavior for ciborium to call GetManagedObjects
several times waiting for it to return successfully. It is assumed that
the org.freedesktop.UDisks2 name is acquired the interface show up.

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:1ae4442633616fc7200e3baa7f8d977b534a1a7b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1470/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1149/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1378/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1637/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/770/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1470/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:1ae4442633616fc7200e3baa7f8d977b534a1a7b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1471/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1150/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1379/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1638/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/771/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1471/rebuild

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

Would be nice to have a test case for this.

review: Needs Fixing

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:b51b77d54c61f550acf5506498e4bc45ae8a555e
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1476/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1165/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1384/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1653/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/783/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1476/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:9da139f1d92eeb59c7e9843624cd5a307023583e
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1489/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1248/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1397/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1676/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/862/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1489/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:02780daf296c5962619250182bf2a0f8aaf193ae
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1490/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1249
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1398/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1677
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/863/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1490/rebuild

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:3eb45037d49e5601767c5041f4e9096e7d7bf7b7
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1492/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1251/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1400/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1679/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/865/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1492/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:0d582f337135fd5218d9439039c8c1a30b6083e9
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1493/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1252
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1401/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1680
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/866/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1493/rebuild

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:8b2e056fe056d83ae4762384b5b61b340d8ad9bc
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1494/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1253
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1402/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1681
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/867/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1494/rebuild

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:8c22719633a3b701b5f64f7eee24c021db798e2b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1496/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1265
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1404/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1693
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/879/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1496/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/docs/reference/snap-configuration/automount.md b/docs/reference/snap-configuration/automount.md
index a400fcd..e825a5c 100644
--- a/docs/reference/snap-configuration/automount.md
+++ b/docs/reference/snap-configuration/automount.md
@@ -35,6 +35,9 @@ If all requirements are fulfilled by a storage device or some of its partitions,
 they are mounted in */media* in a directory specific for the *root* user. The path
 generally follows this schema: */media/<user>/<storage device id/name>*
 
+When enabled this feature will also mount any device plugged in before the boot that
+fulfill the above rules.
+
 ## Enable Automount
 
 The udisks2 snap provides a single configuration option which can be used to turn
diff --git a/tests/main/installation/task.yaml b/tests/main/installation/task.yaml
index 93a9e2c..e98f9a7 100644
--- a/tests/main/installation/task.yaml
+++ b/tests/main/installation/task.yaml
@@ -13,6 +13,6 @@ execute: |
     /snap/bin/udisks2.udisksctl status
 
     # Ensure all necessary plugs/slots are connected
-    snap interfaces | grep -Pzq ":mount-observe +udisks2"
+    snap interfaces | grep -Pzq ":mount-observe +[a-z,-]*udisks2"
     snap interfaces | grep -Pzq "udisks2:service +udisks2:client"
-    snap interfaces | grep -Pzq ":network-bind +udisks2"
+    snap interfaces | grep -Pzq ":network-bind +[a-z,-]*udisks2"
diff --git a/udisks2/udisks2.go b/udisks2/udisks2.go
index 5ab03be..ec8217c 100644
--- a/udisks2/udisks2.go
+++ b/udisks2/udisks2.go
@@ -51,6 +51,7 @@ const (
 	dbusPropertiesInterface     = "org.freedesktop.DBus.Properties"
 	dbusAddedSignal             = "InterfacesAdded"
 	dbusRemovedSignal           = "InterfacesRemoved"
+	defaultMaximumWaitTime      = 64
 )
 
 type MountEvent struct {
@@ -208,77 +209,78 @@ func (u *UDisks2) mountpointsForPath(p dbus.ObjectPath) []string {
 
 func (u *UDisks2) Init() (err error) {
 	d, err := newDispatcher(u.conn)
-	if err == nil {
-		u.dispatcher = d
-		u.jobs = newJobManager(d)
-		go func() {
-			for {
-				select {
-				case e := <-u.dispatcher.Additions:
-					if err := u.processAddEvent(&e); err != nil {
-						log.Print("Issues while processing ", e.Path, ": ", err)
-					}
-				case e := <-u.dispatcher.Removals:
-					if err := u.processRemoveEvent(e.Path, e.Interfaces); err != nil {
-						log.Println("Issues while processing remove event:", err)
-					}
-				case j := <-u.jobs.UnmountJobs:
-					if j.WasCompleted {
-						log.Println("Unmount job was finished for", j.Event.Path, "for paths", j.Paths)
-						for _, path := range j.Paths {
-							u.umountCompleted <- path
-							log.Println("Removing", path, "from", u.mountpoints)
-							delete(u.mountpoints, dbus.ObjectPath(path))
-						}
-					} else {
-						log.Print("Unmount job started.")
+	if err != nil {
+		return err
+	}
+
+	u.dispatcher = d
+	u.jobs = newJobManager(d)
+	go func() {
+		for {
+			select {
+			case e := <-u.dispatcher.Additions:
+				if err := u.processAddEvent(&e); err != nil {
+					log.Print("Issues while processing ", e.Path, ": ", err)
+				}
+			case e := <-u.dispatcher.Removals:
+				if err := u.processRemoveEvent(e.Path, e.Interfaces); err != nil {
+					log.Println("Issues while processing remove event:", err)
+				}
+			case j := <-u.jobs.UnmountJobs:
+				if j.WasCompleted {
+					log.Println("Unmount job was finished for", j.Event.Path, "for paths", j.Paths)
+					for _, path := range j.Paths {
+						u.umountCompleted <- path
+						log.Println("Removing", path, "from", u.mountpoints)
+						delete(u.mountpoints, dbus.ObjectPath(path))
 					}
-				case j := <-u.jobs.MountJobs:
-					if j.WasCompleted {
-						log.Println("Mount job was finished for", j.Event.Path, "for paths", j.Paths)
-						for _, path := range j.Paths {
-							// grab the mointpoints from the variant
-							mountpoints := u.mountpointsForPath(dbus.ObjectPath(path))
-							log.Println("Mount points are", mountpoints)
-							if len(mountpoints) > 0 {
-								p := dbus.ObjectPath(path)
-								mp := string(mountpoints[0])
-								u.mountpoints[p] = string(mp)
-								// update the drives
-								for _, d := range u.drives {
-									changed := d.SetMounted(p)
-									if changed {
-										e := MountEvent{d.Path, mp}
-										log.Println("New mount event", e)
-										go func() {
-											for _, t := range [...]int{1, 2, 3, 4, 5, 10} {
-												_, err := os.Stat(mp)
-												if err != nil {
-													log.Println("Mountpoint", mp, "not yet present. Wating", t, "seconds due to", err)
-													time.Sleep(time.Duration(t) * time.Second)
-												} else {
-													break
-												}
+				} else {
+					log.Print("Unmount job started.")
+				}
+			case j := <-u.jobs.MountJobs:
+				if j.WasCompleted {
+					log.Println("Mount job was finished for", j.Event.Path, "for paths", j.Paths)
+					for _, path := range j.Paths {
+						// grab the mointpoints from the variant
+						mountpoints := u.mountpointsForPath(dbus.ObjectPath(path))
+						log.Println("Mount points are", mountpoints)
+						if len(mountpoints) > 0 {
+							p := dbus.ObjectPath(path)
+							mp := string(mountpoints[0])
+							u.mountpoints[p] = string(mp)
+							// update the drives
+							for _, d := range u.drives {
+								changed := d.SetMounted(p)
+								if changed {
+									e := MountEvent{d.Path, mp}
+									log.Println("New mount event", e)
+									go func() {
+										for _, t := range [...]int{1, 2, 3, 4, 5, 10} {
+											_, err := os.Stat(mp)
+											if err != nil {
+												log.Println("Mountpoint", mp, "not yet present. Wating", t, "seconds due to", err)
+												time.Sleep(time.Duration(t) * time.Second)
+											} else {
+												break
 											}
-											log.Println("Sending new event to channel.")
-											u.mountCompleted <- e
-										}()
-									}
+										}
+										log.Println("Sending new event to channel.")
+										u.mountCompleted <- e
+									}()
 								}
 							}
-
 						}
-					} else {
-						log.Print("Mount job started.")
+
 					}
+				} else {
+					log.Print("Mount job started.")
 				}
 			}
-		}()
-		d.Init()
-		u.emitExistingDevices()
-		return nil
-	}
-	return err
+		}
+	}()
+	d.Init()
+	u.emitExistingDevices()
+	return nil
 }
 
 func (u *UDisks2) connectToSignal(path dbus.ObjectPath, inter, member string) (*dbus.SignalWatch, error) {
@@ -304,10 +306,26 @@ func (u *UDisks2) emitExistingDevices() {
 	u.startLock.Lock()
 	defer u.startLock.Unlock()
 	obj := u.conn.Object(dbusName, dbusObject)
-	reply, err := obj.Call(dbusObjectManagerInterface, "GetManagedObjects")
-	if err != nil {
-		log.Println("Cannot get initial state for devices:", err)
-		return
+
+	// At certain systems it has been observed that although the
+	// org.freedesktop.UDisks2 name is registered the ObjectManager
+	// interface is not immediately ready. As a result the
+	// "GetManagedObjects" call fails and the cold-plugged usb devices
+	// are not reported. The code below calls GetManagedObjects several
+	// times waiting for it to return successfully. It is assumed that
+	// once the org.freedesktop.UDisks2 name is acquired the interface
+	// will show up.
+	var reply *dbus.Message
+	f := fibonacci()
+	for i := f(); i < defaultMaximumWaitTime; i = f() {
+		var err error
+		reply, err = obj.Call(dbusObjectManagerInterface, "GetManagedObjects")
+		if err != nil {
+			log.Println("Cannot get initial state for devices:", err)
+			time.Sleep(time.Duration(i) * time.Second)
+		} else {
+			break
+		}
 	}
 
 	allDevices := make(map[dbus.ObjectPath]InterfacesAndProperties)
diff --git a/udisks2/utils.go b/udisks2/utils.go
new file mode 100644
index 0000000..97f1053
--- /dev/null
+++ b/udisks2/utils.go
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * Authors:
+ * Konrad Zapalowicz <[e-mail]>
+ *
+ * ciborium is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ciborium is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package udisks2
+
+// Returns a function that returns fibonacci sequence
+// that starts from 1
+func fibonacci() func() int {
+	a, b := 1, 1
+	return func() int {
+		retval := a
+		a, b = b, a+b
+		return retval
+	}
+}
diff --git a/udisks2/utils_test.go b/udisks2/utils_test.go
new file mode 100644
index 0000000..0b33a51
--- /dev/null
+++ b/udisks2/utils_test.go
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * Authors:
+ * Konrad Zapalowicz <[e-mail]>
+ *
+ * ciborium is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ciborium is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package udisks2
+
+import (
+	. "launchpad.net/gocheck"
+)
+
+type UtilsTestSuite struct{}
+
+var _ = Suite(&UtilsTestSuite{})
+
+func (s *UtilsTestSuite) TestFibonacci(c *C) {
+	fib := fibonacci()
+	c.Assert(fib(), Equals, 1)
+	c.Assert(fib(), Equals, 1)
+	c.Assert(fib(), Equals, 2)
+	c.Assert(fib(), Equals, 3)
+	c.Assert(fib(), Equals, 5)
+}