Merge lp:~chipaca/snappy/delayed-service-start into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

This creates wait4network, which waits for network, and makes services that define an external port depend on that.

This creates wait4network, which waits for network, and makes services that define an external port depend on that. Wouldn't be necessary if network-online.target were more sensible for our use.

[Ricardo Salveti (rsalveti)]

Inline.

review: Needs Information

[lp:~chipaca/snappy/delayed-service-start]

616. By John Lenton on 2015-07-29

Merged firstboot-networking-restart into delayed-service-start.

[Sergio Schvezov (sergiusens)]

This MP makes me feel weary. Is this just for webdm? I might just take a stance and try to fix it there.

[Sergio Schvezov (sergiusens)]

review: Needs Information

[Oliver Grawert (ogra)]

how about instead of "phoning home" you just check if a default route is set, that should serve the same purpose but will get us less people complain about privacy :)

[lp:~chipaca/snappy/delayed-service-start]

617. By John Lenton on 2015-07-29

brilliantly, check for a default route instead of "the internet", as that is good enough for us.

[Oliver Grawert (ogra)]

shiny !!

review: Approve

[lp:~chipaca/snappy/delayed-service-start]

618. By John Lenton on 2015-07-29

nuked the go wait4network altogether

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'debian/golang-snappy-dev.install'
--- debian/golang-snappy-dev.install	2015-03-18 19:26:18 +0000
+++ debian/golang-snappy-dev.install	2015-07-29 18:50:43 +0000
@@ -1,1 +1,2 @@
+/usr/bin/xgettext-go
 /usr/share/gocode

=== modified file 'debian/rules'
--- debian/rules	2015-07-01 07:48:19 +0000
+++ debian/rules	2015-07-29 18:50:43 +0000
@@ -4,6 +4,7 @@
 #export DH_VERBOSE=1
 export DH_OPTIONS
 export DH_GOPKG := launchpad.net/snappy
+#export DEB_BUILD_OPTIONS=nocheck
 
 %:
 	dh $@ --buildsystem=golang --with=golang --fail-missing --with systemd
@@ -30,6 +31,10 @@
 		--no-enable \
 		-pubuntu-snappy \
 		snappy-autopilot.service
+	# enable wait4network
+	dh_systemd_enable \
+		-pubuntu-snappy \
+		snappy-wait4network.service
 
 override_dh_systemd_start:
 	# start boot-ok
@@ -49,6 +54,10 @@
 		--no-start \
 		-pubuntu-snappy \
 		snappy-autopilot.service
+	# start wait4network
+	dh_systemd_start \
+		-pubuntu-snappy \
+		snappy-wait4network.service
 
 override_dh_auto_build:
 	# this will update the i18n stuff

=== added file 'debian/snappy-wait4network.service'
--- debian/snappy-wait4network.service	1970-01-01 00:00:00 +0000
+++ debian/snappy-wait4network.service	2015-07-29 18:50:43 +0000
@@ -0,0 +1,10 @@
+[Unit]
+Description=Wait for network
+After=network-online.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+TimeoutStartSec=0
+ExecStart=/bin/sh -ec 'while [ -z "$( /sbin/ip route show 0/0 )" ]; do sleep 5; done'
+

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-07-23 11:05:37 +0000
+++ snappy/click.go	2015-07-29 18:50:43 +0000
@@ -444,6 +444,7 @@
 			StopTimeout: time.Duration(service.StopTimeout),
 			AaProfile:   aaProfile,
 			IsFramework: m.Type == pkg.TypeFramework,
+			IsNetworked: service.Ports != nil && len(service.Ports.External) > 0,
 			BusName:     service.BusName,
 			UdevAppName: udevPartName,
 		}), nil

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-07-23 11:05:37 +0000
+++ snappy/click_test.go	2015-07-29 18:50:43 +0000
@@ -1231,6 +1231,7 @@
 WantedBy=multi-user.target
 `
 	expectedServiceAppWrapper = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target", ".canonical", "canonical", "\n", helpers.UbuntuArchitecture())
+	expectedNetAppWrapper     = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target\nAfter=snappy-wait4network.service\nRequires=snappy-wait4network.service", ".canonical", "canonical", "\n", helpers.UbuntuArchitecture())
 	expectedServiceFmkWrapper = fmt.Sprintf(expectedServiceWrapperFmt, "Before=ubuntu-snappy.frameworks.target\nAfter=ubuntu-snappy.frameworks-pre.target\nRequires=ubuntu-snappy.frameworks-pre.target", "", "", "BusName=foo.bar.baz\nType=dbus", helpers.UbuntuArchitecture())
 )
 
@@ -1253,6 +1254,26 @@
 	c.Assert(generatedWrapper, Equals, expectedServiceAppWrapper)
 }
 
+func (s *SnapTestSuite) TestSnappyGenerateSnapServiceAppWrapperWithExternalPort(c *C) {
+	service := ServiceYaml{
+		Name:        "xkcd-webserver",
+		Start:       "bin/foo start",
+		Stop:        "bin/foo stop",
+		PostStop:    "bin/foo post-stop",
+		StopTimeout: DefaultTimeout,
+		Description: "A fun webserver",
+		Ports:       &Ports{External: map[string]Port{"foo": Port{}}},
+	}
+	pkgPath := "/apps/xkcd-webserver.canonical/0.3.4/"
+	aaProfile := "xkcd-webserver.canonical_xkcd-webserver_0.3.4"
+	m := packageYaml{Name: "xkcd-webserver",
+		Version: "0.3.4"}
+
+	generatedWrapper, err := generateSnapServicesFile(service, pkgPath, aaProfile, &m)
+	c.Assert(err, IsNil)
+	c.Assert(generatedWrapper, Equals, expectedNetAppWrapper)
+}
+
 func (s *SnapTestSuite) TestSnappyGenerateSnapServiceFmkWrapper(c *C) {
 	service := ServiceYaml{
 		Name:        "xkcd-webserver",

=== modified file 'systemd/systemd.go'
--- systemd/systemd.go	2015-07-23 13:15:56 +0000
+++ systemd/systemd.go	2015-07-29 18:50:43 +0000
@@ -84,6 +84,7 @@
 	StopTimeout time.Duration
 	AaProfile   string
 	IsFramework bool
+	IsNetworked bool
 	BusName     string
 	UdevAppName string
 }
@@ -205,7 +206,9 @@
 {{if .IsFramework}}Before=ubuntu-snappy.frameworks.target
 After=ubuntu-snappy.frameworks-pre.target
 Requires=ubuntu-snappy.frameworks-pre.target{{else}}After=ubuntu-snappy.frameworks.target
-Requires=ubuntu-snappy.frameworks.target{{end}}
+Requires=ubuntu-snappy.frameworks.target{{end}}{{if .IsNetworked}}
+After=snappy-wait4network.service
+Requires=snappy-wait4network.service{{end}}
 X-Snappy=yes
 
 [Service]

=== modified file 'systemd/systemd_test.go'
--- systemd/systemd_test.go	2015-07-23 13:15:56 +0000
+++ systemd/systemd_test.go	2015-07-29 18:50:43 +0000
@@ -181,6 +181,10 @@
 	expectedAppService  = fmt.Sprintf(expectedServiceFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target", ".mvo", "mvo", "\n", helpers.UbuntuArchitecture())
 	expectedFmkService  = fmt.Sprintf(expectedServiceFmt, "Before=ubuntu-snappy.frameworks.target\nAfter=ubuntu-snappy.frameworks-pre.target\nRequires=ubuntu-snappy.frameworks-pre.target", "", "", "\n", helpers.UbuntuArchitecture())
 	expectedDbusService = fmt.Sprintf(expectedServiceFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target", ".mvo", "mvo", "BusName=foo.bar.baz\nType=dbus", helpers.UbuntuArchitecture())
+
+	// things that need network
+	expectedNetAppService = fmt.Sprintf(expectedServiceFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target\nAfter=snappy-wait4network.service\nRequires=snappy-wait4network.service", ".mvo", "mvo", "\n", helpers.UbuntuArchitecture())
+	expectedNetFmkService = fmt.Sprintf(expectedServiceFmt, "Before=ubuntu-snappy.frameworks.target\nAfter=ubuntu-snappy.frameworks-pre.target\nRequires=ubuntu-snappy.frameworks-pre.target\nAfter=snappy-wait4network.service\nRequires=snappy-wait4network.service", "", "", "\n", helpers.UbuntuArchitecture())
 )
 
 func (s *SystemdTestSuite) TestGenAppServiceFile(c *C) {
@@ -202,6 +206,26 @@
 	c.Check(New("", nil).GenServiceFile(desc), Equals, expectedAppService)
 }
 
+func (s *SystemdTestSuite) TestGenNetAppServiceFile(c *C) {
+
+	desc := &ServiceDescription{
+		AppName:     "app",
+		ServiceName: "service",
+		Version:     "1.0",
+		Description: "descr",
+		AppPath:     "/apps/app.mvo/1.0/",
+		Start:       "bin/start",
+		Stop:        "bin/stop",
+		PostStop:    "bin/stop --post",
+		StopTimeout: time.Duration(10 * time.Second),
+		AaProfile:   "aa-profile",
+		IsNetworked: true,
+		UdevAppName: "app.mvo",
+	}
+
+	c.Check(New("", nil).GenServiceFile(desc), Equals, expectedNetAppService)
+}
+
 func (s *SystemdTestSuite) TestGenFmkServiceFile(c *C) {
 
 	desc := &ServiceDescription{
@@ -222,6 +246,27 @@
 	c.Check(New("", nil).GenServiceFile(desc), Equals, expectedFmkService)
 }
 
+func (s *SystemdTestSuite) TestGenNetFmkServiceFile(c *C) {
+
+	desc := &ServiceDescription{
+		AppName:     "app",
+		ServiceName: "service",
+		Version:     "1.0",
+		Description: "descr",
+		AppPath:     "/apps/app/1.0/",
+		Start:       "bin/start",
+		Stop:        "bin/stop",
+		PostStop:    "bin/stop --post",
+		StopTimeout: time.Duration(10 * time.Second),
+		AaProfile:   "aa-profile",
+		IsNetworked: true,
+		IsFramework: true,
+		UdevAppName: "app",
+	}
+
+	c.Check(New("", nil).GenServiceFile(desc), Equals, expectedNetFmkService)
+}
+
 func (s *SystemdTestSuite) TestGenServiceFileWithBusName(c *C) {
 
 	desc := &ServiceDescription{