* [PATCH RFC 0/3] tools: systemd patches
@ 2014-10-20 15:01 Wei Liu
2014-10-20 15:01 ` [PATCH RFC 1/3] systemd: fix clean target in Makefile Wei Liu
` (2 more replies)
0 siblings, 3 replies; 25+ messages in thread
From: Wei Liu @ 2014-10-20 15:01 UTC (permalink / raw)
To: xen-devel; +Cc: tlviewer, olaf, Wei Liu, ian.campbell, mcgrof, ian.jackson
This small series tries to fix some problems in systemd stuffs.
The first patch was based on one of Olaf's email on fixing the clean target.
Patch 2 and 3 add a missing service to run xen-init-dom0. I don't have working
SystemD setup to test it so it's only RFC. I basically Copy-n-paste from some
existing service config to make up that one.
The basic thing is that we need to run xen-init-dom0 to generate JSON config
stub for Dom0 before xendomains. xen-init-dom0 only needs to run once.
Wei.
Wei Liu (3):
systemd: fix clean target in Makefile
systemd: add xen-init-dom0 service
systemd: xendomains now depends on xen-init-dom0
tools/configure.ac | 1 +
tools/hotplug/Linux/systemd/Makefile | 2 ++
tools/hotplug/Linux/systemd/xen-init-dom0.service.in | 14 ++++++++++++++
tools/hotplug/Linux/systemd/xendomains.service.in | 2 +-
4 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 tools/hotplug/Linux/systemd/xen-init-dom0.service.in
--
1.7.10.4
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH RFC 1/3] systemd: fix clean target in Makefile
2014-10-20 15:01 [PATCH RFC 0/3] tools: systemd patches Wei Liu
@ 2014-10-20 15:01 ` Wei Liu
2014-10-22 11:12 ` Ian Campbell
2014-10-20 15:01 ` [PATCH RFC 2/3] systemd: add xen-init-dom0 service Wei Liu
2014-10-20 15:01 ` [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0 Wei Liu
2 siblings, 1 reply; 25+ messages in thread
From: Wei Liu @ 2014-10-20 15:01 UTC (permalink / raw)
To: xen-devel; +Cc: tlviewer, olaf, Wei Liu, ian.campbell, mcgrof, ian.jackson
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/hotplug/Linux/systemd/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile
index 9c58b33..0c40a73 100644
--- a/tools/hotplug/Linux/systemd/Makefile
+++ b/tools/hotplug/Linux/systemd/Makefile
@@ -25,6 +25,7 @@ all: $(ALL_XEN_SYSTEMD)
.PHONY: clean
clean:
+ rm -f $(XEN_SYSTEMD_MODULES)
.PHONY: install
install: $(ALL_XEN_SYSTEMD)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-20 15:01 [PATCH RFC 0/3] tools: systemd patches Wei Liu
2014-10-20 15:01 ` [PATCH RFC 1/3] systemd: fix clean target in Makefile Wei Liu
@ 2014-10-20 15:01 ` Wei Liu
2014-10-20 15:24 ` Olaf Hering
2014-10-20 18:53 ` Mark Pryor
2014-10-20 15:01 ` [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0 Wei Liu
2 siblings, 2 replies; 25+ messages in thread
From: Wei Liu @ 2014-10-20 15:01 UTC (permalink / raw)
To: xen-devel; +Cc: tlviewer, olaf, Wei Liu, ian.campbell, mcgrof, ian.jackson
Please rerun autoconf after applying this patch.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/configure.ac | 1 +
tools/hotplug/Linux/systemd/Makefile | 1 +
tools/hotplug/Linux/systemd/xen-init-dom0.service.in | 14 ++++++++++++++
3 files changed, 16 insertions(+)
create mode 100644 tools/hotplug/Linux/systemd/xen-init-dom0.service.in
diff --git a/tools/configure.ac b/tools/configure.ac
index f584798..62ccf47 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -15,6 +15,7 @@ hotplug/Linux/init.d/xendomains
hotplug/Linux/systemd/proc-xen.mount
hotplug/Linux/systemd/var-lib-xenstored.mount
hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
+hotplug/Linux/systemd/xen-init-dom0.service
hotplug/Linux/systemd/xen-watchdog.service
hotplug/Linux/systemd/xenconsoled.service
hotplug/Linux/systemd/xendomains.service
diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile
index 0c40a73..51c10fe 100644
--- a/tools/hotplug/Linux/systemd/Makefile
+++ b/tools/hotplug/Linux/systemd/Makefile
@@ -14,6 +14,7 @@ XEN_SYSTEMD_SERVICE += xenconsoled.service
XEN_SYSTEMD_SERVICE += xen-qemu-dom0-disk-backend.service
XEN_SYSTEMD_SERVICE += xendomains.service
XEN_SYSTEMD_SERVICE += xen-watchdog.service
+XEN_SYSTEMD_SERVICE += xen-init-dom0.service
ALL_XEN_SYSTEMD = $(XEN_SYSTEMD_MODULES) \
$(XEN_SYSTEMD_MOUNT) \
diff --git a/tools/hotplug/Linux/systemd/xen-init-dom0.service.in b/tools/hotplug/Linux/systemd/xen-init-dom0.service.in
new file mode 100644
index 0000000..79f13c8
--- /dev/null
+++ b/tools/hotplug/Linux/systemd/xen-init-dom0.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=xen-init-dom0, initialise JSON configuration stub for Dom0
+Requires=xenstored.socket
+After=xenstored.service
+ConditionVirtualization=xen
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
+ExecStart=@LIBEXEC_BIN@/xen-init-dom0
+
+[Install]
+WantedBy=multi-user.target
--
1.7.10.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-20 15:01 ` [PATCH RFC 2/3] systemd: add xen-init-dom0 service Wei Liu
@ 2014-10-20 15:24 ` Olaf Hering
2014-10-20 15:40 ` Wei Liu
2014-10-20 18:53 ` Mark Pryor
1 sibling, 1 reply; 25+ messages in thread
From: Olaf Hering @ 2014-10-20 15:24 UTC (permalink / raw)
To: Wei Liu; +Cc: tlviewer, mcgrof, ian.jackson, ian.campbell, xen-devel
On Mon, Oct 20, Wei Liu wrote:
> +ConditionVirtualization=xen
This should be "ConditionPathExists=/proc/xen/capabilities".
Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-20 15:24 ` Olaf Hering
@ 2014-10-20 15:40 ` Wei Liu
2014-10-21 8:24 ` Olaf Hering
0 siblings, 1 reply; 25+ messages in thread
From: Wei Liu @ 2014-10-20 15:40 UTC (permalink / raw)
To: Olaf Hering
Cc: tlviewer, Wei Liu, ian.campbell, mcgrof, ian.jackson, xen-devel
On Mon, Oct 20, 2014 at 05:24:00PM +0200, Olaf Hering wrote:
> On Mon, Oct 20, Wei Liu wrote:
>
> > +ConditionVirtualization=xen
>
> This should be "ConditionPathExists=/proc/xen/capabilities".
>
OK. Just saw your other patches.
Other than this, did I get the Type= and RemainAfterExit= right?
Wei.
> Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-20 15:40 ` Wei Liu
@ 2014-10-21 8:24 ` Olaf Hering
2014-10-21 9:20 ` Wei Liu
0 siblings, 1 reply; 25+ messages in thread
From: Olaf Hering @ 2014-10-21 8:24 UTC (permalink / raw)
To: Wei Liu; +Cc: tlviewer, mcgrof, ian.jackson, ian.campbell, xen-devel
On Mon, Oct 20, Wei Liu wrote:
> Other than this, did I get the Type= and RemainAfterExit= right?
I know very little about this, but it looks correct according to
http://www.freedesktop.org/software/systemd/man/systemd.service.html
Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-21 8:24 ` Olaf Hering
@ 2014-10-21 9:20 ` Wei Liu
2014-10-21 17:06 ` Mark Pryor
0 siblings, 1 reply; 25+ messages in thread
From: Wei Liu @ 2014-10-21 9:20 UTC (permalink / raw)
To: Olaf Hering
Cc: tlviewer, Wei Liu, ian.campbell, mcgrof, ian.jackson, xen-devel
On Tue, Oct 21, 2014 at 10:24:17AM +0200, Olaf Hering wrote:
> On Mon, Oct 20, Wei Liu wrote:
>
> > Other than this, did I get the Type= and RemainAfterExit= right?
>
> I know very little about this, but it looks correct according to
> http://www.freedesktop.org/software/systemd/man/systemd.service.html
>
>
Fair enough. I read the same document.
Wei.
> Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-21 9:20 ` Wei Liu
@ 2014-10-21 17:06 ` Mark Pryor
2014-10-22 11:58 ` Wei Liu
0 siblings, 1 reply; 25+ messages in thread
From: Mark Pryor @ 2014-10-21 17:06 UTC (permalink / raw)
To: Wei Liu, Olaf Hering
Cc: mcgrof@do-not-panic.com, ian.jackson@eu.citrix.com,
ian.campbell@citrix.com, xen-devel@lists.xen.org
Tues Oct 21 build
a)Tried a build without a separate service for xen-init-dom0, but
ran it as ExecStartPost from xenstored service.
Spent 1.5 hours:
reset unstable git
plan which patches to use
tuned a patch for goal a)
configure and build (no problem)
packaged RPM
disabled the xen-init-dom0 service & unstalled old RPM
installed & tested new build
It worked and is compatibile with current systemd services
My notes, patches, & RPM (for C7 with systemd) are in the usual place
On Tuesday, October 21, 2014 2:20 AM, Wei Liu <wei.liu2@citrix.com> wrote:
On Tue, Oct 21, 2014 at 10:24:17AM +0200, Olaf Hering wrote:
> On Mon, Oct 20, Wei Liu wrote:
>
> > Other than this, did I get the Type= and RemainAfterExit= right?
>
> I know very little about this, but it looks correct according to
> http://www.freedesktop.org/software/systemd/man/systemd.service.html
>
>
Fair enough. I read the same document.
Wei.
> Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-21 17:06 ` Mark Pryor
@ 2014-10-22 11:58 ` Wei Liu
0 siblings, 0 replies; 25+ messages in thread
From: Wei Liu @ 2014-10-22 11:58 UTC (permalink / raw)
To: Mark Pryor
Cc: Olaf Hering, Wei Liu, ian.campbell@citrix.com,
mcgrof@do-not-panic.com, ian.jackson@eu.citrix.com,
xen-devel@lists.xen.org
On Tue, Oct 21, 2014 at 10:06:42AM -0700, Mark Pryor wrote:
> Tues Oct 21 build
>
> a)Tried a build without a separate service for xen-init-dom0, but
> ran it as ExecStartPost from xenstored service.
>
While this might be a more direct approach, conceptually it's not very
correct.
xen-init-dom0 does more than just writing xenstore nodes, and can
potentially be dependent on by / depend on other services , so it should
be a dedicated service IMHO.
Wei.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-20 15:01 ` [PATCH RFC 2/3] systemd: add xen-init-dom0 service Wei Liu
2014-10-20 15:24 ` Olaf Hering
@ 2014-10-20 18:53 ` Mark Pryor
2014-10-20 20:27 ` Wei Liu
1 sibling, 1 reply; 25+ messages in thread
From: Mark Pryor @ 2014-10-20 18:53 UTC (permalink / raw)
To: Wei Liu, xen-devel@lists.xen.org
Cc: olaf@aepfle.de, ian.jackson@eu.citrix.com,
ian.campbell@citrix.com, mcgrof@do-not-panic.com
If its still RFC stage, then how can we be sure that the JSON config file for dom0 is written to /var/lib/xen?
/var/lib/xen/userdata-d.0.00000000-0000-0000-0000-000000000000.libxl-json
If its not there by the time xendomains starts then the rest of the patch can't help.
When I run
`xl list -l 0`
I can see the same errors. libxl is trying to open the above file and get the JSON config for dom0. If I hack a stub config into this file everything starts working as expected. I can't modify xen-init-dom0.c
I have no idea how to make sure its writing the above JSON config. Can someone take a look?
thanks,
Mark
BTW, I am willing to test a set of patches in C7+systemd twice a week. I noticed that `git pull` for unstable is populated mostly on Friday. So I will build at most on Tuesday and Friday.
On Monday, October 20, 2014 8:17 AM, Wei Liu <wei.liu2@citrix.com> wrote:
Please rerun autoconf after applying this patch.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/configure.ac | 1 +
tools/hotplug/Linux/systemd/Makefile | 1 +
tools/hotplug/Linux/systemd/xen-init-dom0.service.in | 14 ++++++++++++++
3 files changed, 16 insertions(+)
create mode 100644 tools/hotplug/Linux/systemd/xen-init-dom0.service.in
diff --git a/tools/configure.ac b/tools/configure.ac
index f584798..62ccf47 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -15,6 +15,7 @@ hotplug/Linux/init.d/xendomains
hotplug/Linux/systemd/proc-xen.mount
hotplug/Linux/systemd/var-lib-xenstored.mount
hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service
+hotplug/Linux/systemd/xen-init-dom0.service
hotplug/Linux/systemd/xen-watchdog.service
hotplug/Linux/systemd/xenconsoled.service
hotplug/Linux/systemd/xendomains.service
diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile
index 0c40a73..51c10fe 100644
--- a/tools/hotplug/Linux/systemd/Makefile
+++ b/tools/hotplug/Linux/systemd/Makefile
@@ -14,6 +14,7 @@ XEN_SYSTEMD_SERVICE += xenconsoled.service
XEN_SYSTEMD_SERVICE += xen-qemu-dom0-disk-backend.service
XEN_SYSTEMD_SERVICE += xendomains.service
XEN_SYSTEMD_SERVICE += xen-watchdog.service
+XEN_SYSTEMD_SERVICE += xen-init-dom0.service
ALL_XEN_SYSTEMD = $(XEN_SYSTEMD_MODULES) \
$(XEN_SYSTEMD_MOUNT) \
diff --git a/tools/hotplug/Linux/systemd/xen-init-dom0.service.in b/tools/hotplug/Linux/systemd/xen-init-dom0.service.in
new file mode 100644
index 0000000..79f13c8
--- /dev/null
+++ b/tools/hotplug/Linux/systemd/xen-init-dom0.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=xen-init-dom0, initialise JSON configuration stub for Dom0
+Requires=xenstored.socket
+After=xenstored.service
+ConditionVirtualization=xen
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
+ExecStart=@LIBEXEC_BIN@/xen-init-dom0
+
+[Install]
+WantedBy=multi-user.target
--
1.7.10.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-20 18:53 ` Mark Pryor
@ 2014-10-20 20:27 ` Wei Liu
2014-10-20 20:49 ` Mark Pryor
2014-10-21 7:27 ` Olaf Hering
0 siblings, 2 replies; 25+ messages in thread
From: Wei Liu @ 2014-10-20 20:27 UTC (permalink / raw)
To: Mark Pryor
Cc: olaf@aepfle.de, Wei Liu, ian.campbell@citrix.com,
mcgrof@do-not-panic.com, ian.jackson@eu.citrix.com,
xen-devel@lists.xen.org
On Mon, Oct 20, 2014 at 11:53:26AM -0700, Mark Pryor wrote:
> If its still RFC stage, then how can we be sure that the JSON config file for dom0 is written to /var/lib/xen?
> /var/lib/xen/userdata-d.0.00000000-0000-0000-0000-000000000000.libxl-json
>
You can delete that file before rebooting.
But this series alone won't work though. You need to remove two more
lines in xenstored.service.
diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in
index 013e69e..e3bf837 100644
--- a/tools/hotplug/Linux/systemd/xenstored.service.in
+++ b/tools/hotplug/Linux/systemd/xenstored.service.in
@@ -17,8 +17,6 @@ ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb*
ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@
ExecStart=/bin/sh -c "exec $XENSTORED --no-fork $XENSTORED_ARGS"
-ExecStartPost=-@bindir@/xenstore-write "/local/domain/0/name" "Domain-0"
-ExecStartPost=-@bindir@/xenstore-write "/local/domain/0/domid" 0
> If its not there by the time xendomains starts then the rest of the patch can't help.
>
> When I run
> `xl list -l 0`
> I can see the same errors. libxl is trying to open the above file and get the JSON config for dom0. If I hack a stub config into this file everything starts working as expected. I can't modify xen-init-dom0.c
>
>
> I have no idea how to make sure its writing the above JSON config. Can someone take a look?
Delete that file before rebooting. xen-init-dom0 will create one when it
runs.
> thanks,
> Mark
>
> BTW, I am willing to test a set of patches in C7+systemd twice a week. I noticed that `git pull` for unstable is populated mostly on Friday. So I will build at most on Tuesday and Friday.
>
That's fine. I'm pretty sure we're very close to the bottom of this
problem. It's just one missing systemd service. But Olaf is still
working on refining systemd stuffs, so you might as well just wait.
Wei.
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-20 20:27 ` Wei Liu
@ 2014-10-20 20:49 ` Mark Pryor
2014-10-20 21:00 ` Wei Liu
2014-10-21 7:27 ` Olaf Hering
1 sibling, 1 reply; 25+ messages in thread
From: Mark Pryor @ 2014-10-20 20:49 UTC (permalink / raw)
To: Wei Liu
Cc: olaf@aepfle.de, mcgrof@do-not-panic.com,
ian.jackson@eu.citrix.com, ian.campbell@citrix.com,
xen-devel@lists.xen.org
Wei,
removing the 2 lines in xenstored.service was key to let xen-init-dom0 do the right thing.
The JSON file is now created at Xen start (before Xendomains starts).
I tested it by direct edits to systemd service file without a new build.
`xl list -l 0` also gives the expected results.
In logs, its different now (no more `dom0 already setup`)
---------- log ----------
13:41:05 c7dom0 xen-init-dom0: Done setting up Dom0
13:41:05 c7dom0 systemd: Started xen-init-dom0, initialise JSON configuration stub for Dom0.
---------- snip -------
thanks for getting to the bottom of this,
On Monday, October 20, 2014 1:27 PM, Wei Liu <wei.liu2@citrix.com> wrote:
On Mon, Oct 20, 2014 at 11:53:26AM -0700, Mark Pryor wrote:
> If its still RFC stage, then how can we be sure that the JSON config file for dom0 is written to /var/lib/xen?
> /var/lib/xen/userdata-d.0.00000000-0000-0000-0000-000000000000.libxl-json
>
You can delete that file before rebooting.
But this series alone won't work though. You need to remove two more
lines in xenstored.service.
diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in
index 013e69e..e3bf837 100644
--- a/tools/hotplug/Linux/systemd/xenstored.service.in
+++ b/tools/hotplug/Linux/systemd/xenstored.service.in
@@ -17,8 +17,6 @@ ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb*
ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@
ExecStart=/bin/sh -c "exec $XENSTORED --no-fork $XENSTORED_ARGS"
-ExecStartPost=-@bindir@/xenstore-write "/local/domain/0/name" "Domain-0"
-ExecStartPost=-@bindir@/xenstore-write "/local/domain/0/domid" 0
> If its not there by the time xendomains starts then the rest of the patch can't help.
>
> When I run
> `xl list -l 0`
> I can see the same errors. libxl is trying to open the above file and get the JSON config for dom0. If I hack a stub config into this file everything starts working as expected. I can't modify xen-init-dom0.c
>
>
> I have no idea how to make sure its writing the above JSON config. Can someone take a look?
Delete that file before rebooting. xen-init-dom0 will create one when it
runs.
Wei.
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-20 20:49 ` Mark Pryor
@ 2014-10-20 21:00 ` Wei Liu
0 siblings, 0 replies; 25+ messages in thread
From: Wei Liu @ 2014-10-20 21:00 UTC (permalink / raw)
To: Mark Pryor
Cc: olaf@aepfle.de, Wei Liu, ian.campbell@citrix.com,
mcgrof@do-not-panic.com, ian.jackson@eu.citrix.com,
xen-devel@lists.xen.org
On Mon, Oct 20, 2014 at 01:49:56PM -0700, Mark Pryor wrote:
> Wei,
>
> removing the 2 lines in xenstored.service was key to let xen-init-dom0 do the right thing.
> The JSON file is now created at Xen start (before Xendomains starts).
>
> I tested it by direct edits to systemd service file without a new build.
> `xl list -l 0` also gives the expected results.
>
> In logs, its different now (no more `dom0 already setup`)
> ---------- log ----------
>
> 13:41:05 c7dom0 xen-init-dom0: Done setting up Dom0
> 13:41:05 c7dom0 systemd: Started xen-init-dom0, initialise JSON configuration stub for Dom0.
>
> ---------- snip -------
>
> thanks for getting to the bottom of this,
>
Thanks for testing.
Wei.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-20 20:27 ` Wei Liu
2014-10-20 20:49 ` Mark Pryor
@ 2014-10-21 7:27 ` Olaf Hering
2014-10-21 8:49 ` Ian Campbell
1 sibling, 1 reply; 25+ messages in thread
From: Olaf Hering @ 2014-10-21 7:27 UTC (permalink / raw)
To: Wei Liu
Cc: Mark Pryor, mcgrof@do-not-panic.com, ian.jackson@eu.citrix.com,
ian.campbell@citrix.com, xen-devel@lists.xen.org
On Mon, Oct 20, Wei Liu wrote:
> diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in
> index 013e69e..e3bf837 100644
> --- a/tools/hotplug/Linux/systemd/xenstored.service.in
> +++ b/tools/hotplug/Linux/systemd/xenstored.service.in
> @@ -17,8 +17,6 @@ ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
> ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb*
> ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@
> ExecStart=/bin/sh -c "exec $XENSTORED --no-fork $XENSTORED_ARGS"
> -ExecStartPost=-@bindir@/xenstore-write "/local/domain/0/name" "Domain-0"
> -ExecStartPost=-@bindir@/xenstore-write "/local/domain/0/domid" 0
This should have been in ae931f568fe9e91179f3ff3aab199a84d39a626b
("libxl: introduce helper to initialise Dom0").
Acked-by: Olaf Hering <olaf@aepfle.de>
Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-21 7:27 ` Olaf Hering
@ 2014-10-21 8:49 ` Ian Campbell
2014-10-21 9:18 ` Wei Liu
0 siblings, 1 reply; 25+ messages in thread
From: Ian Campbell @ 2014-10-21 8:49 UTC (permalink / raw)
To: Olaf Hering
Cc: Mark Pryor, mcgrof@do-not-panic.com, Wei Liu,
ian.jackson@eu.citrix.com, xen-devel@lists.xen.org
On Tue, 2014-10-21 at 09:27 +0200, Olaf Hering wrote:
> On Mon, Oct 20, Wei Liu wrote:
>
> > diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in
> > index 013e69e..e3bf837 100644
> > --- a/tools/hotplug/Linux/systemd/xenstored.service.in
> > +++ b/tools/hotplug/Linux/systemd/xenstored.service.in
> > @@ -17,8 +17,6 @@ ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
> > ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb*
> > ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@
> > ExecStart=/bin/sh -c "exec $XENSTORED --no-fork $XENSTORED_ARGS"
> > -ExecStartPost=-@bindir@/xenstore-write "/local/domain/0/name" "Domain-0"
> > -ExecStartPost=-@bindir@/xenstore-write "/local/domain/0/domid" 0
>
> This should have been in ae931f568fe9e91179f3ff3aab199a84d39a626b
> ("libxl: introduce helper to initialise Dom0").
Since that commit didn't adjust the systemd integration I don't think
that's right. I'm expecting Wei will include it in the eventual patch
set to switch systemd over to the new helper.
>
>
> Acked-by: Olaf Hering <olaf@aepfle.de>
>
>
> Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH RFC 2/3] systemd: add xen-init-dom0 service
2014-10-21 8:49 ` Ian Campbell
@ 2014-10-21 9:18 ` Wei Liu
0 siblings, 0 replies; 25+ messages in thread
From: Wei Liu @ 2014-10-21 9:18 UTC (permalink / raw)
To: Ian Campbell
Cc: Mark Pryor, Olaf Hering, Wei Liu, mcgrof@do-not-panic.com,
ian.jackson@eu.citrix.com, xen-devel@lists.xen.org
On Tue, Oct 21, 2014 at 09:49:52AM +0100, Ian Campbell wrote:
> On Tue, 2014-10-21 at 09:27 +0200, Olaf Hering wrote:
> > On Mon, Oct 20, Wei Liu wrote:
> >
> > > diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in
> > > index 013e69e..e3bf837 100644
> > > --- a/tools/hotplug/Linux/systemd/xenstored.service.in
> > > +++ b/tools/hotplug/Linux/systemd/xenstored.service.in
> > > @@ -17,8 +17,6 @@ ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
> > > ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb*
> > > ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@
> > > ExecStart=/bin/sh -c "exec $XENSTORED --no-fork $XENSTORED_ARGS"
> > > -ExecStartPost=-@bindir@/xenstore-write "/local/domain/0/name" "Domain-0"
> > > -ExecStartPost=-@bindir@/xenstore-write "/local/domain/0/domid" 0
> >
> > This should have been in ae931f568fe9e91179f3ff3aab199a84d39a626b
> > ("libxl: introduce helper to initialise Dom0").
>
> Since that commit didn't adjust the systemd integration I don't think
> that's right. I'm expecting Wei will include it in the eventual patch
> set to switch systemd over to the new helper.
>
Yes. I will submit a new series soon.
> >
> >
> > Acked-by: Olaf Hering <olaf@aepfle.de>
> >
> >
> > Olaf
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0
2014-10-20 15:01 [PATCH RFC 0/3] tools: systemd patches Wei Liu
2014-10-20 15:01 ` [PATCH RFC 1/3] systemd: fix clean target in Makefile Wei Liu
2014-10-20 15:01 ` [PATCH RFC 2/3] systemd: add xen-init-dom0 service Wei Liu
@ 2014-10-20 15:01 ` Wei Liu
2014-10-22 11:14 ` Ian Campbell
2 siblings, 1 reply; 25+ messages in thread
From: Wei Liu @ 2014-10-20 15:01 UTC (permalink / raw)
To: xen-devel; +Cc: tlviewer, olaf, Wei Liu, ian.campbell, mcgrof, ian.jackson
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/hotplug/Linux/systemd/xendomains.service.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in
index f88c336..8577317 100644
--- a/tools/hotplug/Linux/systemd/xendomains.service.in
+++ b/tools/hotplug/Linux/systemd/xendomains.service.in
@@ -1,7 +1,7 @@
[Unit]
Description=Xendomains - start and stop guests on boot and shutdown
Requires=xenstored.socket
-After=xenstored.service xenconsoled.service
+After=xenstored.service xenconsoled.service xen-init-dom0.service
ConditionVirtualization=xen
[Service]
--
1.7.10.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0
2014-10-20 15:01 ` [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0 Wei Liu
@ 2014-10-22 11:14 ` Ian Campbell
2014-10-22 11:51 ` Olaf Hering
0 siblings, 1 reply; 25+ messages in thread
From: Ian Campbell @ 2014-10-22 11:14 UTC (permalink / raw)
To: Wei Liu; +Cc: tlviewer, olaf, mcgrof, ian.jackson, xen-devel
On Mon, 2014-10-20 at 16:01 +0100, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
This patch seems to be correct.
But, should nothing else depend on this? There doesn't seem to be an
umbrella "all the stuff needed for xen" module. Maybe one isn't needed?
Ian.
> ---
> tools/hotplug/Linux/systemd/xendomains.service.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in
> index f88c336..8577317 100644
> --- a/tools/hotplug/Linux/systemd/xendomains.service.in
> +++ b/tools/hotplug/Linux/systemd/xendomains.service.in
> @@ -1,7 +1,7 @@
> [Unit]
> Description=Xendomains - start and stop guests on boot and shutdown
> Requires=xenstored.socket
> -After=xenstored.service xenconsoled.service
> +After=xenstored.service xenconsoled.service xen-init-dom0.service
> ConditionVirtualization=xen
>
> [Service]
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0
2014-10-22 11:14 ` Ian Campbell
@ 2014-10-22 11:51 ` Olaf Hering
2014-10-22 12:02 ` Wei Liu
0 siblings, 1 reply; 25+ messages in thread
From: Olaf Hering @ 2014-10-22 11:51 UTC (permalink / raw)
To: Ian Campbell; +Cc: ian.jackson, mcgrof, Wei Liu, tlviewer, xen-devel
On Wed, Oct 22, Ian Campbell wrote:
> On Mon, 2014-10-20 at 16:01 +0100, Wei Liu wrote:
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
>
> This patch seems to be correct.
>
> But, should nothing else depend on this? There doesn't seem to be an
> umbrella "all the stuff needed for xen" module. Maybe one isn't needed?
Nice that you ask. I was already thinking of a xencommons.service which
just depends on everything required. Its certainly possible to enable
each manually. This is what I have in my INSTALL file:
Systemd support
===============
If the systemd development packages are available then the support for
systemd will be enabled per default. It is required to manually enable
the installed systemd service files. Systemd has dependency tracking,
which means all dependencies wil be started automatically:
systemctl enable xen-qemu-dom0-disk-backend.service
systemctl enable xen-init-dom0.service
systemctl enable xenconsoled.service
Other optional services are:
systemctl enable xen-domains.service
systemctl enable xen-watchdog.service
Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0
2014-10-22 11:51 ` Olaf Hering
@ 2014-10-22 12:02 ` Wei Liu
2014-10-22 12:11 ` Andrew Cooper
2014-10-22 12:18 ` Olaf Hering
0 siblings, 2 replies; 25+ messages in thread
From: Wei Liu @ 2014-10-22 12:02 UTC (permalink / raw)
To: Olaf Hering
Cc: tlviewer, Wei Liu, Ian Campbell, mcgrof, ian.jackson, xen-devel
On Wed, Oct 22, 2014 at 01:51:55PM +0200, Olaf Hering wrote:
> On Wed, Oct 22, Ian Campbell wrote:
>
> > On Mon, 2014-10-20 at 16:01 +0100, Wei Liu wrote:
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> >
> > This patch seems to be correct.
> >
> > But, should nothing else depend on this? There doesn't seem to be an
> > umbrella "all the stuff needed for xen" module. Maybe one isn't needed?
>
I once thought about this but wasn't quite sure. Given that I was quite
new to systemd and we were approaching freeze I focused on fixing this
one bug only. But since you asked, I think a xencommons service is
sensible.
> Nice that you ask. I was already thinking of a xencommons.service which
> just depends on everything required. Its certainly possible to enable
> each manually. This is what I have in my INSTALL file:
>
Is this suitable for 4.5? Do you can to take over my systemd patch
series and work on it for 4.5? I'm fine with that.
Wei.
> Systemd support
> ===============
>
> If the systemd development packages are available then the support for
> systemd will be enabled per default. It is required to manually enable
> the installed systemd service files. Systemd has dependency tracking,
> which means all dependencies wil be started automatically:
>
> systemctl enable xen-qemu-dom0-disk-backend.service
> systemctl enable xen-init-dom0.service
> systemctl enable xenconsoled.service
>
> Other optional services are:
> systemctl enable xen-domains.service
> systemctl enable xen-watchdog.service
>
>
> Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0
2014-10-22 12:02 ` Wei Liu
@ 2014-10-22 12:11 ` Andrew Cooper
2014-10-22 12:18 ` Olaf Hering
1 sibling, 0 replies; 25+ messages in thread
From: Andrew Cooper @ 2014-10-22 12:11 UTC (permalink / raw)
To: Wei Liu, Olaf Hering
Cc: tlviewer, xen-devel, ian.jackson, Ian Campbell, mcgrof
On 22/10/14 13:02, Wei Liu wrote:
> On Wed, Oct 22, 2014 at 01:51:55PM +0200, Olaf Hering wrote:
>> On Wed, Oct 22, Ian Campbell wrote:
>>
>>> On Mon, 2014-10-20 at 16:01 +0100, Wei Liu wrote:
>>>> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
>>> This patch seems to be correct.
>>>
>>> But, should nothing else depend on this? There doesn't seem to be an
>>> umbrella "all the stuff needed for xen" module. Maybe one isn't needed?
> I once thought about this but wasn't quite sure. Given that I was quite
> new to systemd and we were approaching freeze I focused on fixing this
> one bug only. But since you asked, I think a xencommons service is
> sensible.
>
>> Nice that you ask. I was already thinking of a xencommons.service which
>> just depends on everything required. Its certainly possible to enable
>> each manually. This is what I have in my INSTALL file:
>>
> Is this suitable for 4.5? Do you can to take over my systemd patch
> series and work on it for 4.5? I'm fine with that.
>
> Wei.
This systemd support is brand new for 4.5, and it would be lovely to get
it working properly right from the start.
>From a release perspective, the risk is that systemd support will be
better/worse given specific patches, but there is no possibility of
regressions compared to 4.4
~Andrew
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0
2014-10-22 12:02 ` Wei Liu
2014-10-22 12:11 ` Andrew Cooper
@ 2014-10-22 12:18 ` Olaf Hering
2014-10-22 12:20 ` Wei Liu
1 sibling, 1 reply; 25+ messages in thread
From: Olaf Hering @ 2014-10-22 12:18 UTC (permalink / raw)
To: Wei Liu; +Cc: tlviewer, mcgrof, ian.jackson, Ian Campbell, xen-devel
On Wed, Oct 22, Wei Liu wrote:
> Is this suitable for 4.5? Do you can to take over my systemd patch
> series and work on it for 4.5? I'm fine with that.
Yes, I will fix any fallout.
Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0
2014-10-22 12:18 ` Olaf Hering
@ 2014-10-22 12:20 ` Wei Liu
2014-10-22 20:26 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 25+ messages in thread
From: Wei Liu @ 2014-10-22 12:20 UTC (permalink / raw)
To: Olaf Hering
Cc: tlviewer, Wei Liu, Ian Campbell, mcgrof, ian.jackson, xen-devel
On Wed, Oct 22, 2014 at 02:18:06PM +0200, Olaf Hering wrote:
> On Wed, Oct 22, Wei Liu wrote:
>
> > Is this suitable for 4.5? Do you can to take over my systemd patch
> > series and work on it for 4.5? I'm fine with that.
>
> Yes, I will fix any fallout.
>
Cool, thank you!
Wei.
> Olaf
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0
2014-10-22 12:20 ` Wei Liu
@ 2014-10-22 20:26 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 25+ messages in thread
From: Konrad Rzeszutek Wilk @ 2014-10-22 20:26 UTC (permalink / raw)
To: Wei Liu; +Cc: tlviewer, Olaf Hering, Ian Campbell, mcgrof, ian.jackson,
xen-devel
On Wed, Oct 22, 2014 at 01:20:22PM +0100, Wei Liu wrote:
> On Wed, Oct 22, 2014 at 02:18:06PM +0200, Olaf Hering wrote:
> > On Wed, Oct 22, Wei Liu wrote:
> >
> > > Is this suitable for 4.5? Do you can to take over my systemd patch
> > > series and work on it for 4.5? I'm fine with that.
> >
> > Yes, I will fix any fallout.
> >
>
> Cool, thank you!
Lets put in the fixes then.
Would it also be good to CC Michael Young (m.a.young@durham.ac.uk) on those
patches since when he does the Xen 4.5 RPMs he might have to ditch/rebase
his systemd patchset.
Thank you.
>
> Wei.
>
> > Olaf
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2014-10-22 20:26 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-20 15:01 [PATCH RFC 0/3] tools: systemd patches Wei Liu
2014-10-20 15:01 ` [PATCH RFC 1/3] systemd: fix clean target in Makefile Wei Liu
2014-10-22 11:12 ` Ian Campbell
2014-10-20 15:01 ` [PATCH RFC 2/3] systemd: add xen-init-dom0 service Wei Liu
2014-10-20 15:24 ` Olaf Hering
2014-10-20 15:40 ` Wei Liu
2014-10-21 8:24 ` Olaf Hering
2014-10-21 9:20 ` Wei Liu
2014-10-21 17:06 ` Mark Pryor
2014-10-22 11:58 ` Wei Liu
2014-10-20 18:53 ` Mark Pryor
2014-10-20 20:27 ` Wei Liu
2014-10-20 20:49 ` Mark Pryor
2014-10-20 21:00 ` Wei Liu
2014-10-21 7:27 ` Olaf Hering
2014-10-21 8:49 ` Ian Campbell
2014-10-21 9:18 ` Wei Liu
2014-10-20 15:01 ` [PATCH RFC 3/3] systemd: xendomains now depends on xen-init-dom0 Wei Liu
2014-10-22 11:14 ` Ian Campbell
2014-10-22 11:51 ` Olaf Hering
2014-10-22 12:02 ` Wei Liu
2014-10-22 12:11 ` Andrew Cooper
2014-10-22 12:18 ` Olaf Hering
2014-10-22 12:20 ` Wei Liu
2014-10-22 20:26 ` Konrad Rzeszutek Wilk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.