3:14 a.m.
Hi, All
Now upon failure kdump script might not be called at all and it might
not be able to execute default action. It results in a hang.
Because we disable emergency shell and rely on kdump.sh being invoked
through dracut-pre-pivot hook. But it might happen that we never call
into dracut-pre-pivot hook because certain systemd targets could not
reach due to failure in their dependencies. In those cases error
handling code does not run and system hangs.
To solve this problem, we need to separate the error handling code from
dracut-pre-pivot hook, and every time when a failure shows up, the
separated code can be called by the emergency service.
By default systemd provides an emergency service which will drop us into
shell every time upon a critical failure. It's very convenient for us to
re-use the framework of systemd emergency, because we don't have to
touch the other parts of systemd. We can use our own script instead of
the default one.
This new scheme will overwrite emergency shell and replace with kdump
error handling code. And this code will do the error handling as needed.
Now, we will not rely on dracut-pre-pivot hook running always. Instead
whenever error happens and it is serious enough that emergency shell
needed to run, now kdump error handler will run.
This patchset introduce a new kdump emergency service. It will override the
existing emergency.service. When fatal error occurs, this emergency service
will be triggered and systemd will isolate to emergency path.
This kdump emergency service can will read kdump.conf and act according to the
configired "default action" (reboot/poweroff/halt/shell/dump_to_rootfs).
Along with this patchset, kdump-capture.service is introduced as a service unit
to run kdump.sh. When kdump-capture.service fails, systemd will isolate to
kdump emergency service. I copied all the dependencies from
dracut-pre-pivot.service to kdump-capture.service so that kdump.sh will be
called at the correct time window.
v2:
Address several comments from Vivek:
- split [patch 1] into 1/6 and 2/6
- remove several unnecessary lines in service unit.
- modify the description of kdump-capture.service
- introduce another kdump lib kdump-lib-2.sh used in 2nd kernel.
V3:
Address several comments from Vivek:
- update description of [PATCH 1/5] and [PATCH 5/5]
- separate the patch of cleanup to kdump-lib-initramfs.sh
WANG Chao (5):
Introduce kdump error handling service
Introduce kdump capture service
disable dracut-emergency.service the whole time
mkdumprd: mount dump target under /sysroot in 2nd kernel
mkdumprd: append "x-initrd.mount" to the mount options.
dracut-kdump-capture.service | 23 +++++++++++++++++++++++
dracut-kdump-emergency.service | 23 +++++++++++++++++++++++
dracut-kdump-error-handler.sh | 10 ++++++++++
dracut-kdump.sh | 9 ++-------
dracut-module-setup.sh | 7 ++++++-
kexec-tools.spec | 7 ++++++-
mkdumprd | 25 +++++++++++++------------
7 files changed, 83 insertions(+), 21 deletions(-)
create mode 100644 dracut-kdump-capture.service
create mode 100644 dracut-kdump-emergency.service
create mode 100755 dracut-kdump-error-handler.sh
--
1.9.3
3:14 a.m.
New subject: [PATCH v3 1/5] Introduce kdump error handling service
Now upon failure kdump script might not be called at all and it might
not be able to execute default action. It results in a hang.
Because we disable emergency shell and rely on kdump.sh being invoked
through dracut-pre-pivot hook. But it might happen that we never call
into dracut-pre-pivot hook because certain systemd targets could not
reach due to failure in their dependencies. In those cases error
handling code does not run and system hangs.
To solve this problem, we need to separate the error handling code from
dracut-pre-pivot hook, and every time when a failure shows up, the
separated code can be called by the emergency service.
By default systemd provides an emergency service which will drop us into
shell every time upon a critical failure. It's very convenient for us to
re-use the framework of systemd emergency, because we don't have to
touch the other parts of systemd. We can use our own script instead of
the default one.
This new scheme will overwrite emergency shell and replace with kdump
error handling code. And this code will do the error handling as needed.
Now, we will not rely on dracut-pre-pivot hook running always. Instead
whenever error happens and it is serious enough that emergency shell
needed to run, now kdump error handler will run.
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
dracut-kdump-emergency.service | 23 +++++++++++++++++++++++
dracut-kdump-error-handler.sh | 10 ++++++++++
dracut-module-setup.sh | 3 +++
kexec-tools.spec | 5 ++++-
4 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 dracut-kdump-emergency.service
create mode 100755 dracut-kdump-error-handler.sh
diff --git a/dracut-kdump-emergency.service b/dracut-kdump-emergency.service
new file mode 100644
index 0000000..6c90420
--- /dev/null
+++ b/dracut-kdump-emergency.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Kdump Error Handler
+DefaultDependencies=no
+After=systemd-vconsole-setup.service
+Wants=systemd-vconsole-setup.service
+
+[Service]
+Environment=HOME=/
+Environment=DRACUT_SYSTEMD=1
+Environment=NEWROOT=/sysroot
+WorkingDirectory=/
+ExecStart=/bin/kdump-error-handler.sh
+ExecStopPost=-/usr/bin/systemctl --fail --no-block default
+Type=oneshot
+StandardInput=tty-force
+StandardOutput=inherit
+StandardError=inherit
+KillMode=process
+IgnoreSIGPIPE=no
+
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
+# terminates cleanly.
+KillSignal=SIGHUP
diff --git a/dracut-kdump-error-handler.sh b/dracut-kdump-error-handler.sh
new file mode 100755
index 0000000..2f0f1d1
--- /dev/null
+++ b/dracut-kdump-error-handler.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+. /lib/kdump-lib-initramfs.sh
+
+set -o pipefail
+export PATH=$PATH:$KDUMP_SCRIPT_DIR
+
+get_kdump_confs
+do_default_action
+do_final_action
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 84bf975..4799219 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -556,6 +556,9 @@ install() {
inst_hook pre-pivot 9999 "$moddir/kdump.sh"
inst "/lib/kdump/kdump-lib.sh" "/lib/kdump-lib.sh"
inst "/lib/kdump/kdump-lib-initramfs.sh"
"/lib/kdump-lib-initramfs.sh"
+ inst "$moddir/kdump-error-handler.sh"
"/usr/bin/kdump-error-handler.sh"
+ # Replace existing emergency service
+ cp "$moddir/kdump-emergency.service"
"$initdir/$systemdsystemunitdir/emergency.service"
# Check for all the devices and if any device is iscsi, bring up iscsi
# target. Ideally all this should be pushed into dracut iscsi module
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 5aa919c..2023874 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -36,6 +36,8 @@ Source24: kdump-lib-initramfs.sh
Source100: dracut-kdump.sh
Source101: dracut-module-setup.sh
Source102: dracut-monitor_dd_progress
+Source103: dracut-kdump-error-handler.sh
+Source104: dracut-kdump-emergency.service
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -210,7 +212,8 @@ mkdir -p -m755
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpba
cp %{SOURCE100}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE100}}
cp %{SOURCE101}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE101}}
cp %{SOURCE102}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE102}}
-
+cp %{SOURCE103}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE103}}
+cp %{SOURCE104}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE104}}
chmod 755
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE100}}
chmod 755
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE101}}
--
1.9.3
3:53 a.m.
New subject: [PATCH v3 1/5] Introduce kdump error handling service
On 07/18/14 at 04:14pm, WANG Chao wrote:
Now upon failure kdump script might not be called at all and it
might
not be able to execute default action. It results in a hang.
Because we disable emergency shell and rely on kdump.sh being invoked
through dracut-pre-pivot hook. But it might happen that we never call
into dracut-pre-pivot hook because certain systemd targets could not
reach due to failure in their dependencies. In those cases error
handling code does not run and system hangs.
To solve this problem, we need to separate the error handling code from
dracut-pre-pivot hook, and every time when a failure shows up, the
separated code can be called by the emergency service.
By default systemd provides an emergency service which will drop us into
shell every time upon a critical failure. It's very convenient for us to
re-use the framework of systemd emergency, because we don't have to
touch the other parts of systemd. We can use our own script instead of
the default one.
This new scheme will overwrite emergency shell and replace with kdump
error handling code. And this code will do the error handling as needed.
Now, we will not rely on dracut-pre-pivot hook running always. Instead
whenever error happens and it is serious enough that emergency shell
needed to run, now kdump error handler will run.
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
dracut-kdump-emergency.service | 23 +++++++++++++++++++++++
dracut-kdump-error-handler.sh | 10 ++++++++++
dracut-module-setup.sh | 3 +++
kexec-tools.spec | 5 ++++-
4 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 dracut-kdump-emergency.service
create mode 100755 dracut-kdump-error-handler.sh
diff --git a/dracut-kdump-emergency.service b/dracut-kdump-emergency.service
new file mode 100644
index 0000000..6c90420
--- /dev/null
+++ b/dracut-kdump-emergency.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Kdump Error Handler
+DefaultDependencies=no
+After=systemd-vconsole-setup.service
+Wants=systemd-vconsole-setup.service
+
+[Service]
+Environment=HOME=/
+Environment=DRACUT_SYSTEMD=1
+Environment=NEWROOT=/sysroot
+WorkingDirectory=/
+ExecStart=/bin/kdump-error-handler.sh
+ExecStopPost=-/usr/bin/systemctl --fail --no-block default
+Type=oneshot
+StandardInput=tty-force
+StandardOutput=inherit
+StandardError=inherit
+KillMode=process
+IgnoreSIGPIPE=no
+
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
+# terminates cleanly.
+KillSignal=SIGHUP
diff --git a/dracut-kdump-error-handler.sh b/dracut-kdump-error-handler.sh
new file mode 100755
index 0000000..2f0f1d1
--- /dev/null
+++ b/dracut-kdump-error-handler.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+. /lib/kdump-lib-initramfs.sh
+
+set -o pipefail
+export PATH=$PATH:$KDUMP_SCRIPT_DIR
+
+get_kdump_confs
+do_default_action
+do_final_action
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 84bf975..4799219 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -556,6 +556,9 @@ install() {
inst_hook pre-pivot 9999 "$moddir/kdump.sh"
inst "/lib/kdump/kdump-lib.sh" "/lib/kdump-lib.sh"
inst "/lib/kdump/kdump-lib-initramfs.sh"
"/lib/kdump-lib-initramfs.sh"
+ inst "$moddir/kdump-error-handler.sh"
"/usr/bin/kdump-error-handler.sh"
+ # Replace existing emergency service
+ cp "$moddir/kdump-emergency.service"
"$initdir/$systemdsystemunitdir/emergency.service"
in case root login, Fedora use "cp -i" as alias of cp, so maybe use /usr/bin/cp
can avoid the
overwriting prompt..
# Check for all the devices and if any device is iscsi, bring up iscsi
# target. Ideally all this should be pushed into dracut iscsi module
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 5aa919c..2023874 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -36,6 +36,8 @@ Source24: kdump-lib-initramfs.sh
Source100: dracut-kdump.sh
Source101: dracut-module-setup.sh
Source102: dracut-monitor_dd_progress
+Source103: dracut-kdump-error-handler.sh
+Source104: dracut-kdump-emergency.service
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -210,7 +212,8 @@ mkdir -p -m755
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpba
cp %{SOURCE100}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE100}}
cp %{SOURCE101}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE101}}
cp %{SOURCE102}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE102}}
-
+cp %{SOURCE103}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE103}}
+cp %{SOURCE104}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE104}}
chmod 755
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE100}}
chmod 755
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE101}}
--
1.9.3
_______________________________________________
kexec mailing list
kexec(a)lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/kexec
4:24 a.m.
New subject: [PATCH v3 1/5] Introduce kdump error handling service
> diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
> index 84bf975..4799219 100755
> --- a/dracut-module-setup.sh
> +++ b/dracut-module-setup.sh
> @@ -556,6 +556,9 @@ install() {
> inst_hook pre-pivot 9999 "$moddir/kdump.sh"
> inst "/lib/kdump/kdump-lib.sh" "/lib/kdump-lib.sh"
> inst "/lib/kdump/kdump-lib-initramfs.sh"
"/lib/kdump-lib-initramfs.sh"
> + inst "$moddir/kdump-error-handler.sh"
"/usr/bin/kdump-error-handler.sh"
> + # Replace existing emergency service
> + cp "$moddir/kdump-emergency.service"
"$initdir/$systemdsystemunitdir/emergency.service"
in case root login, Fedora use "cp -i" as alias of cp, so maybe use /usr/bin/cp
can avoid the
overwriting prompt..
Tried on chao's machine, cp in scripts will not inherit the alias, so just ignore this
comment.
1:06 p.m.
New subject: [PATCH v3 1/5] Introduce kdump error handling service
On Fri, Jul 18, 2014 at 04:14:01PM +0800, WANG Chao wrote:
Now upon failure kdump script might not be called at all and it
might
not be able to execute default action. It results in a hang.
Because we disable emergency shell and rely on kdump.sh being invoked
through dracut-pre-pivot hook. But it might happen that we never call
into dracut-pre-pivot hook because certain systemd targets could not
reach due to failure in their dependencies. In those cases error
handling code does not run and system hangs.
To solve this problem, we need to separate the error handling code from
dracut-pre-pivot hook, and every time when a failure shows up, the
separated code can be called by the emergency service.
By default systemd provides an emergency service which will drop us into
shell every time upon a critical failure. It's very convenient for us to
re-use the framework of systemd emergency, because we don't have to
touch the other parts of systemd. We can use our own script instead of
the default one.
This new scheme will overwrite emergency shell and replace with kdump
error handling code. And this code will do the error handling as needed.
Now, we will not rely on dracut-pre-pivot hook running always. Instead
whenever error happens and it is serious enough that emergency shell
needed to run, now kdump error handler will run.
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
dracut-kdump-emergency.service | 23 +++++++++++++++++++++++
dracut-kdump-error-handler.sh | 10 ++++++++++
dracut-module-setup.sh | 3 +++
kexec-tools.spec | 5 ++++-
4 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 dracut-kdump-emergency.service
create mode 100755 dracut-kdump-error-handler.sh
diff --git a/dracut-kdump-emergency.service b/dracut-kdump-emergency.service
new file mode 100644
index 0000000..6c90420
--- /dev/null
+++ b/dracut-kdump-emergency.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Kdump Error Handler
+DefaultDependencies=no
+After=systemd-vconsole-setup.service
+Wants=systemd-vconsole-setup.service
+
+[Service]
+Environment=HOME=/
+Environment=DRACUT_SYSTEMD=1
+Environment=NEWROOT=/sysroot
+WorkingDirectory=/
+ExecStart=/bin/kdump-error-handler.sh
+ExecStopPost=-/usr/bin/systemctl --fail --no-block default
+Type=oneshot
+StandardInput=tty-force
+StandardOutput=inherit
+StandardError=inherit
+KillMode=process
+IgnoreSIGPIPE=no
Hi Chao,
I am thinking more about the licence of this file. We have practically
taken this file from emergency.service of dracut. And in dracut tree
that file has following header.
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
# by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
# See systemd.special(7) for details
I guess either we should send a mail to systemd folks and ask about
licensing. That is if we copy and modify a unit file, what kind of
copyright needs to be attributed and what kind of licensing info
needs to be retained.
My feeling is that to be safe, let us retain that header.
Thanks
Vivek
12:59 a.m.
New subject: [PATCH v3 1/5] Introduce kdump error handling service
On 07/21/14 at 02:06pm, Vivek Goyal wrote:
On Fri, Jul 18, 2014 at 04:14:01PM +0800, WANG Chao wrote:
> Now upon failure kdump script might not be called at all and it might
> not be able to execute default action. It results in a hang.
>
> Because we disable emergency shell and rely on kdump.sh being invoked
> through dracut-pre-pivot hook. But it might happen that we never call
> into dracut-pre-pivot hook because certain systemd targets could not
> reach due to failure in their dependencies. In those cases error
> handling code does not run and system hangs.
>
> To solve this problem, we need to separate the error handling code from
> dracut-pre-pivot hook, and every time when a failure shows up, the
> separated code can be called by the emergency service.
>
> By default systemd provides an emergency service which will drop us into
> shell every time upon a critical failure. It's very convenient for us to
> re-use the framework of systemd emergency, because we don't have to
> touch the other parts of systemd. We can use our own script instead of
> the default one.
>
> This new scheme will overwrite emergency shell and replace with kdump
> error handling code. And this code will do the error handling as needed.
> Now, we will not rely on dracut-pre-pivot hook running always. Instead
> whenever error happens and it is serious enough that emergency shell
> needed to run, now kdump error handler will run.
>
> Signed-off-by: WANG Chao <chaowang(a)redhat.com>
> ---
> dracut-kdump-emergency.service | 23 +++++++++++++++++++++++
> dracut-kdump-error-handler.sh | 10 ++++++++++
> dracut-module-setup.sh | 3 +++
> kexec-tools.spec | 5 ++++-
> 4 files changed, 40 insertions(+), 1 deletion(-)
> create mode 100644 dracut-kdump-emergency.service
> create mode 100755 dracut-kdump-error-handler.sh
>
> diff --git a/dracut-kdump-emergency.service b/dracut-kdump-emergency.service
> new file mode 100644
> index 0000000..6c90420
> --- /dev/null
> +++ b/dracut-kdump-emergency.service
> @@ -0,0 +1,23 @@
> +[Unit]
> +Description=Kdump Error Handler
> +DefaultDependencies=no
> +After=systemd-vconsole-setup.service
> +Wants=systemd-vconsole-setup.service
> +
> +[Service]
> +Environment=HOME=/
> +Environment=DRACUT_SYSTEMD=1
> +Environment=NEWROOT=/sysroot
> +WorkingDirectory=/
> +ExecStart=/bin/kdump-error-handler.sh
> +ExecStopPost=-/usr/bin/systemctl --fail --no-block default
> +Type=oneshot
> +StandardInput=tty-force
> +StandardOutput=inherit
> +StandardError=inherit
> +KillMode=process
> +IgnoreSIGPIPE=no
Hi Chao,
I am thinking more about the licence of this file. We have practically
taken this file from emergency.service of dracut. And in dracut tree
that file has following header.
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
# by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
# See systemd.special(7) for details
I guess either we should send a mail to systemd folks and ask about
licensing. That is if we copy and modify a unit file, what kind of
copyright needs to be attributed and what kind of licensing info
needs to be retained.
My feeling is that to be safe, let us retain that header.
I'm not sure about how GPL will work in this case. But I guess you're
right, it's safe for us to declare the GPL license because we're
basically inherited from a GPL one.
I'll also fix the licensing in kdump-capture.service.
Thanks
WANG Chao
1:32 a.m.
New subject: [PATCH v3 1/5] Introduce kdump error handling service
On 07/22/14 at 01:59pm, WANG Chao wrote:
On 07/21/14 at 02:06pm, Vivek Goyal wrote:
> On Fri, Jul 18, 2014 at 04:14:01PM +0800, WANG Chao wrote:
> > Now upon failure kdump script might not be called at all and it might
> > not be able to execute default action. It results in a hang.
> >
> > Because we disable emergency shell and rely on kdump.sh being invoked
> > through dracut-pre-pivot hook. But it might happen that we never call
> > into dracut-pre-pivot hook because certain systemd targets could not
> > reach due to failure in their dependencies. In those cases error
> > handling code does not run and system hangs.
> >
> > To solve this problem, we need to separate the error handling code from
> > dracut-pre-pivot hook, and every time when a failure shows up, the
> > separated code can be called by the emergency service.
> >
> > By default systemd provides an emergency service which will drop us into
> > shell every time upon a critical failure. It's very convenient for us to
> > re-use the framework of systemd emergency, because we don't have to
> > touch the other parts of systemd. We can use our own script instead of
> > the default one.
> >
> > This new scheme will overwrite emergency shell and replace with kdump
> > error handling code. And this code will do the error handling as needed.
> > Now, we will not rely on dracut-pre-pivot hook running always. Instead
> > whenever error happens and it is serious enough that emergency shell
> > needed to run, now kdump error handler will run.
> >
> > Signed-off-by: WANG Chao <chaowang(a)redhat.com>
> > ---
> > dracut-kdump-emergency.service | 23 +++++++++++++++++++++++
> > dracut-kdump-error-handler.sh | 10 ++++++++++
> > dracut-module-setup.sh | 3 +++
> > kexec-tools.spec | 5 ++++-
> > 4 files changed, 40 insertions(+), 1 deletion(-)
> > create mode 100644 dracut-kdump-emergency.service
> > create mode 100755 dracut-kdump-error-handler.sh
> >
> > diff --git a/dracut-kdump-emergency.service b/dracut-kdump-emergency.service
> > new file mode 100644
> > index 0000000..6c90420
> > --- /dev/null
> > +++ b/dracut-kdump-emergency.service
> > @@ -0,0 +1,23 @@
> > +[Unit]
> > +Description=Kdump Error Handler
> > +DefaultDependencies=no
> > +After=systemd-vconsole-setup.service
> > +Wants=systemd-vconsole-setup.service
> > +
> > +[Service]
> > +Environment=HOME=/
> > +Environment=DRACUT_SYSTEMD=1
> > +Environment=NEWROOT=/sysroot
> > +WorkingDirectory=/
> > +ExecStart=/bin/kdump-error-handler.sh
> > +ExecStopPost=-/usr/bin/systemctl --fail --no-block default
> > +Type=oneshot
> > +StandardInput=tty-force
> > +StandardOutput=inherit
> > +StandardError=inherit
> > +KillMode=process
> > +IgnoreSIGPIPE=no
>
> Hi Chao,
>
> I am thinking more about the licence of this file. We have practically
> taken this file from emergency.service of dracut. And in dracut tree
> that file has following header.
>
> # This file is part of systemd.
> #
> # systemd is free software; you can redistribute it and/or modify it
> # under the terms of the GNU Lesser General Public License as published
> # by
> # the Free Software Foundation; either version 2.1 of the License, or
> # (at your option) any later version.
>
> # See systemd.special(7) for details
And I'll also remove this line. Since this is really not our case.
3:14 a.m.
New subject: [PATCH v3 2/5] Introduce kdump capture service
This patch introduce a new kdump-capture.service which is used to run
kdump.sh.
kdump-capture.service has OnFailure=emergency.target and
OnFailureIsolate=yes set. When kdump.sh fails, the kdump emergency
service will be triggered and enter the error handling path.
In 2nd kernel, the default target for systemd is initrd.target, so we
put kdump-capture.service in initrd.target.wants/ and by that, system
will start kdump-capture as part of the boot process.
kdump.sh used to run in dracut-pre-pivot hook. Now kdump-capture.service
is placed after dracut-pre-pivot.service and other dependencies are all
copied from dracut-pre-pivot.service. So the start point of
kdump.sh will be almost the same as it used to be.
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
dracut-kdump-capture.service | 23 +++++++++++++++++++++++
dracut-kdump.sh | 5 ++---
dracut-module-setup.sh | 4 +++-
kexec-tools.spec | 2 ++
4 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 dracut-kdump-capture.service
diff --git a/dracut-kdump-capture.service b/dracut-kdump-capture.service
new file mode 100644
index 0000000..febe2eb
--- /dev/null
+++ b/dracut-kdump-capture.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Kdump Vmcore Save Service
+After=initrd.target initrd-parse-etc.service sysroot.mount
+After=dracut-initqueue.service dracut-pre-mount.service dracut-mount.service
dracut-pre-pivot.service
+Before=initrd-cleanup.service
+ConditionPathExists=/etc/initrd-release
+OnFailure=emergency.target
+OnFailureIsolate=yes
+
+[Service]
+Environment=DRACUT_SYSTEMD=1
+Environment=NEWROOT=/sysroot
+Type=oneshot
+ExecStart=/bin/kdump.sh
+StandardInput=null
+StandardOutput=syslog
+StandardError=syslog+console
+KillMode=process
+RemainAfterExit=yes
+
+# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
+# terminates cleanly.
+KillSignal=SIGHUP
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index f925667..e90ed0e 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -165,8 +165,7 @@ fence_kdump_notify
get_host_ip
if [ $? -ne 0 ]; then
echo "kdump: get_host_ip exited with non-zero status!"
- do_default_action
- do_final_action
+ exit 1
fi
if [ -z "$DUMP_INSTRUCTION" ]; then
@@ -188,7 +187,7 @@ if [ $? -ne 0 ]; then
fi
if [ $DUMP_RETVAL -ne 0 ]; then
- do_default_action
+ exit 1
fi
do_final_action
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index 4799219..b58146c 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -553,9 +553,11 @@ install() {
inst "/bin/cut" "/bin/cut"
inst "/sbin/makedumpfile" "/sbin/makedumpfile"
inst "/sbin/vmcore-dmesg" "/sbin/vmcore-dmesg"
- inst_hook pre-pivot 9999 "$moddir/kdump.sh"
inst "/lib/kdump/kdump-lib.sh" "/lib/kdump-lib.sh"
inst "/lib/kdump/kdump-lib-initramfs.sh"
"/lib/kdump-lib-initramfs.sh"
+ inst "$moddir/kdump.sh" "/usr/bin/kdump.sh"
+ inst "$moddir/kdump-capture.service"
"$systemdsystemunitdir/kdump-capture.service"
+ ln_r "$systemdsystemunitdir/kdump-capture.service"
"$systemdsystemunitdir/initrd.target.wants/kdump-capture.service"
inst "$moddir/kdump-error-handler.sh"
"/usr/bin/kdump-error-handler.sh"
# Replace existing emergency service
cp "$moddir/kdump-emergency.service"
"$initdir/$systemdsystemunitdir/emergency.service"
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 2023874..6500437 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -38,6 +38,7 @@ Source101: dracut-module-setup.sh
Source102: dracut-monitor_dd_progress
Source103: dracut-kdump-error-handler.sh
Source104: dracut-kdump-emergency.service
+Source105: dracut-kdump-capture.service
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -214,6 +215,7 @@ cp %{SOURCE101}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpb
cp %{SOURCE102}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE102}}
cp %{SOURCE103}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE103}}
cp %{SOURCE104}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE104}}
+cp %{SOURCE105}
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE105}}
chmod 755
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE100}}
chmod 755
$RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix
%{SOURCE101}}
--
1.9.3
1:12 p.m.
New subject: [PATCH v3 2/5] Introduce kdump capture service
On Fri, Jul 18, 2014 at 04:14:02PM +0800, WANG Chao wrote:
This patch introduce a new kdump-capture.service which is used to
run
kdump.sh.
kdump-capture.service has OnFailure=emergency.target and
OnFailureIsolate=yes set. When kdump.sh fails, the kdump emergency
service will be triggered and enter the error handling path.
In 2nd kernel, the default target for systemd is initrd.target, so we
put kdump-capture.service in initrd.target.wants/ and by that, system
will start kdump-capture as part of the boot process.
kdump.sh used to run in dracut-pre-pivot hook. Now kdump-capture.service
is placed after dracut-pre-pivot.service and other dependencies are all
copied from dracut-pre-pivot.service. So the start point of
kdump.sh will be almost the same as it used to be.
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
dracut-kdump-capture.service | 23 +++++++++++++++++++++++
dracut-kdump.sh | 5 ++---
dracut-module-setup.sh | 4 +++-
kexec-tools.spec | 2 ++
4 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 dracut-kdump-capture.service
diff --git a/dracut-kdump-capture.service b/dracut-kdump-capture.service
new file mode 100644
index 0000000..febe2eb
--- /dev/null
+++ b/dracut-kdump-capture.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Kdump Vmcore Save Service
+After=initrd.target initrd-parse-etc.service sysroot.mount
+After=dracut-initqueue.service dracut-pre-mount.service dracut-mount.service
dracut-pre-pivot.service
+Before=initrd-cleanup.service
+ConditionPathExists=/etc/initrd-release
+OnFailure=emergency.target
+OnFailureIsolate=yes
+
+[Service]
+Environment=DRACUT_SYSTEMD=1
+Environment=NEWROOT=/sysroot
+Type=oneshot
+ExecStart=/bin/kdump.sh
+StandardInput=null
+StandardOutput=syslog
+StandardError=syslog+console
+KillMode=process
+RemainAfterExit=yes
Like last mail, I think let us retain the copyright/license info from the
file we copied it.
Thanks
Vivek
3:14 a.m.
New subject: [PATCH v3 3/5] disable dracut-emergency.service the whole time
dracut-emergency.service is conflicting with emergency.service:
"Conflicts=emergency.service emergency.target"
We should always disable dracut-emergency.service. Because if it gets
started, our emergency.service will be interrupted and stopped.
And also dracut-emergency.service isn't useful now, since we introduced
our own error handler.
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
dracut-kdump.sh | 4 ----
1 file changed, 4 deletions(-)
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index e90ed0e..f335ad1 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -4,10 +4,6 @@ exec &> /dev/console
. /lib/dracut-lib.sh
. /lib/kdump-lib-initramfs.sh
-if [ -f "$initdir/lib/dracut/no-emergency-shell" ]; then
- rm -f -- $initdir/lib/dracut/no-emergency-shell
-fi
-
set -o pipefail
export PATH=$PATH:$KDUMP_SCRIPT_DIR
--
1.9.3
3:54 a.m.
New subject: [PATCH v3 3/5] disable dracut-emergency.service the whole time
On 07/18/14 at 04:14pm, WANG Chao wrote:
dracut-emergency.service is conflicting with emergency.service:
"Conflicts=emergency.service emergency.target"
We should always disable dracut-emergency.service. Because if it gets
started, our emergency.service will be interrupted and stopped.
And also dracut-emergency.service isn't useful now, since we introduced
our own error handler.
Merge this into 1/5 looks better ..
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
dracut-kdump.sh | 4 ----
1 file changed, 4 deletions(-)
diff --git a/dracut-kdump.sh b/dracut-kdump.sh
index e90ed0e..f335ad1 100755
--- a/dracut-kdump.sh
+++ b/dracut-kdump.sh
@@ -4,10 +4,6 @@ exec &> /dev/console
. /lib/dracut-lib.sh
. /lib/kdump-lib-initramfs.sh
-if [ -f "$initdir/lib/dracut/no-emergency-shell" ]; then
- rm -f -- $initdir/lib/dracut/no-emergency-shell
-fi
-
set -o pipefail
export PATH=$PATH:$KDUMP_SCRIPT_DIR
--
1.9.3
_______________________________________________
kexec mailing list
kexec(a)lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/kexec
4:19 a.m.
New subject: [PATCH v3 3/5] disable dracut-emergency.service the whole time
On 07/21/14 at 04:54pm, Dave Young wrote:
On 07/18/14 at 04:14pm, WANG Chao wrote:
> dracut-emergency.service is conflicting with emergency.service:
>
> "Conflicts=emergency.service emergency.target"
>
> We should always disable dracut-emergency.service. Because if it gets
> started, our emergency.service will be interrupted and stopped.
>
> And also dracut-emergency.service isn't useful now, since we introduced
> our own error handler.
Merge this into 1/5 looks better ..
OK. Thanks for pointing this out.
3:14 a.m.
New subject: [PATCH v3 4/5] mkdumprd: mount dump target under /sysroot in 2nd kernel
This patch does the following change in 2nd kernel:
- dump target is mounted under /sysroot
With this change, we don't need to track what we've mounted in 2nd
kernel. We can just umount recursively every mount in /sysroot by
command:
umount -R /sysroot
It's very convenient to do so, because it's hard to track what we've
mounted when we're in error handling path. So mount everything under
/sysroot is reasonable and practical for us.
Also clean up a bit along with this patch.
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
mkdumprd | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/mkdumprd b/mkdumprd
index b49b74f..ba35800 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -97,19 +97,19 @@ target_is_root() {
# caller should ensure $1 is valid and mounted in 1st kernel
to_mount() {
- local _dev=$1 _s _t _o _mntopts _pdev
-
- _s=$(findmnt -k -f -n -r -o SOURCE $_dev)
- _t=$(findmnt -k -f -n -r -o TARGET,FSTYPE $_dev)
- _o=$(findmnt -k -f -n -r -o OPTIONS $_dev)
- _o=${_o/#ro/rw} #mount fs target as rw in 2nd kernel
- # "nofail" mount could be run later than kdump.sh. So we don't pass
nofail
- # for short term.
- #_o="${_o},nofail" #with nofail set, systemd won't block for mount
failure
- _mntopts="$_t $_o"
+ local _dev=$1 _source _target _fstype _options _mntopts _pdev
+
+ _source=$(findmnt -k -f -n -r -o SOURCE $_dev)
+ _target=$(findmnt -k -f -n -r -o TARGET $_dev)
+ # mount under /sysroot in 2nd kernel, and we umount -R /sysroot before exit
+ _target="/sysroot$_target"
+ _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
+ _options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
+ _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
+ _mntopts="$_target $_fstype $_options"
#for non-nfs _dev converting to use udev persistent name
- if [ -b "$_s" ]; then
- _pdev="$(get_persistent_dev $_s)"
+ if [ -b "$_source" ]; then
+ _pdev="$(get_persistent_dev $_source)"
if [ $? -ne 0 ]; then
return 1
fi
--
1.9.3
1:17 p.m.
New subject: [PATCH v3 4/5] mkdumprd: mount dump target under /sysroot in 2nd kernel
On Fri, Jul 18, 2014 at 04:14:04PM +0800, WANG Chao wrote:
This patch does the following change in 2nd kernel:
- dump target is mounted under /sysroot
With this change, we don't need to track what we've mounted in 2nd
kernel. We can just umount recursively every mount in /sysroot by
command:
umount -R /sysroot
It's very convenient to do so, because it's hard to track what we've
mounted when we're in error handling path. So mount everything under
/sysroot is reasonable and practical for us.
Also clean up a bit along with this patch.
So, shouldn't all the unmounting be done by systemd reboot path?
Thanks
Vivek
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
mkdumprd | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/mkdumprd b/mkdumprd
index b49b74f..ba35800 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -97,19 +97,19 @@ target_is_root() {
# caller should ensure $1 is valid and mounted in 1st kernel
to_mount() {
- local _dev=$1 _s _t _o _mntopts _pdev
-
- _s=$(findmnt -k -f -n -r -o SOURCE $_dev)
- _t=$(findmnt -k -f -n -r -o TARGET,FSTYPE $_dev)
- _o=$(findmnt -k -f -n -r -o OPTIONS $_dev)
- _o=${_o/#ro/rw} #mount fs target as rw in 2nd kernel
- # "nofail" mount could be run later than kdump.sh. So we don't pass
nofail
- # for short term.
- #_o="${_o},nofail" #with nofail set, systemd won't block for mount
failure
- _mntopts="$_t $_o"
+ local _dev=$1 _source _target _fstype _options _mntopts _pdev
+
+ _source=$(findmnt -k -f -n -r -o SOURCE $_dev)
+ _target=$(findmnt -k -f -n -r -o TARGET $_dev)
+ # mount under /sysroot in 2nd kernel, and we umount -R /sysroot before exit
+ _target="/sysroot$_target"
+ _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
+ _options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
+ _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
+ _mntopts="$_target $_fstype $_options"
#for non-nfs _dev converting to use udev persistent name
- if [ -b "$_s" ]; then
- _pdev="$(get_persistent_dev $_s)"
+ if [ -b "$_source" ]; then
+ _pdev="$(get_persistent_dev $_source)"
if [ $? -ne 0 ]; then
return 1
fi
--
1.9.3
12:54 a.m.
New subject: [PATCH v3 4/5] mkdumprd: mount dump target under /sysroot in 2nd kernel
On 07/21/14 at 02:17pm, Vivek Goyal wrote:
On Fri, Jul 18, 2014 at 04:14:04PM +0800, WANG Chao wrote:
> This patch does the following change in 2nd kernel:
> - dump target is mounted under /sysroot
>
> With this change, we don't need to track what we've mounted in 2nd
> kernel. We can just umount recursively every mount in /sysroot by
> command:
>
> umount -R /sysroot
>
> It's very convenient to do so, because it's hard to track what we've
> mounted when we're in error handling path. So mount everything under
> /sysroot is reasonable and practical for us.
>
> Also clean up a bit along with this patch.
So, shouldn't all the unmounting be done by systemd reboot path?
We're calling "reboot -f" in the end. And this is like force reboot and
will not contact systemd.
IOW, kernel will directly shutdown user space, not letting systemd to do
such job.
Thanks
WANG Chao
10:16 a.m.
New subject: [PATCH v3 4/5] mkdumprd: mount dump target under /sysroot in 2nd kernel
On Tue, Jul 22, 2014 at 01:54:22PM +0800, WANG Chao wrote:
On 07/21/14 at 02:17pm, Vivek Goyal wrote:
> On Fri, Jul 18, 2014 at 04:14:04PM +0800, WANG Chao wrote:
> > This patch does the following change in 2nd kernel:
> > - dump target is mounted under /sysroot
> >
> > With this change, we don't need to track what we've mounted in 2nd
> > kernel. We can just umount recursively every mount in /sysroot by
> > command:
> >
> > umount -R /sysroot
> >
> > It's very convenient to do so, because it's hard to track what
we've
> > mounted when we're in error handling path. So mount everything under
> > /sysroot is reasonable and practical for us.
> >
> > Also clean up a bit along with this patch.
>
> So, shouldn't all the unmounting be done by systemd reboot path?
We're calling "reboot -f" in the end. And this is like force reboot and
will not contact systemd.
IOW, kernel will directly shutdown user space, not letting systemd to do
such job.
And why are we doing it? I think we had discussed this in the past just
that I can't remember the detail.
Why shouldn't we go through regular reboot path. What's so special that
we need to enforce "reboot -f" ourselves.
Thanks
Vivek
5:08 a.m.
New subject: [PATCH v3 4/5] mkdumprd: mount dump target under /sysroot in 2nd kernel
On 07/22/14 at 11:16am, Vivek Goyal wrote:
On Tue, Jul 22, 2014 at 01:54:22PM +0800, WANG Chao wrote:
> On 07/21/14 at 02:17pm, Vivek Goyal wrote:
> > On Fri, Jul 18, 2014 at 04:14:04PM +0800, WANG Chao wrote:
> > > This patch does the following change in 2nd kernel:
> > > - dump target is mounted under /sysroot
> > >
> > > With this change, we don't need to track what we've mounted in
2nd
> > > kernel. We can just umount recursively every mount in /sysroot by
> > > command:
> > >
> > > umount -R /sysroot
> > >
> > > It's very convenient to do so, because it's hard to track what
we've
> > > mounted when we're in error handling path. So mount everything under
> > > /sysroot is reasonable and practical for us.
> > >
> > > Also clean up a bit along with this patch.
> >
> > So, shouldn't all the unmounting be done by systemd reboot path?
>
> We're calling "reboot -f" in the end. And this is like force reboot
and
> will not contact systemd.
>
> IOW, kernel will directly shutdown user space, not letting systemd to do
> such job.
And why are we doing it? I think we had discussed this in the past just
that I can't remember the detail.
Why shouldn't we go through regular reboot path. What's so special that
we need to enforce "reboot -f" ourselves.
I don't remember either. I did some testing today. Actually talking to
systemd for reboot/poweroff/halt works fine.
I think we can switch to a regular reboot/poweroff/halt path. But it's
still worth for us to umount everything we mount early, right?
I'll do that after this patchset gets in.
Thanks
WANG Chao
7:48 a.m.
New subject: [PATCH v3 4/5] mkdumprd: mount dump target under /sysroot in 2nd kernel
On Thu, Jul 24, 2014 at 06:08:44PM +0800, WANG Chao wrote:
On 07/22/14 at 11:16am, Vivek Goyal wrote:
> On Tue, Jul 22, 2014 at 01:54:22PM +0800, WANG Chao wrote:
> > On 07/21/14 at 02:17pm, Vivek Goyal wrote:
> > > On Fri, Jul 18, 2014 at 04:14:04PM +0800, WANG Chao wrote:
> > > > This patch does the following change in 2nd kernel:
> > > > - dump target is mounted under /sysroot
> > > >
> > > > With this change, we don't need to track what we've mounted
in 2nd
> > > > kernel. We can just umount recursively every mount in /sysroot by
> > > > command:
> > > >
> > > > umount -R /sysroot
> > > >
> > > > It's very convenient to do so, because it's hard to track
what we've
> > > > mounted when we're in error handling path. So mount everything
under
> > > > /sysroot is reasonable and practical for us.
> > > >
> > > > Also clean up a bit along with this patch.
> > >
> > > So, shouldn't all the unmounting be done by systemd reboot path?
> >
> > We're calling "reboot -f" in the end. And this is like force
reboot and
> > will not contact systemd.
> >
> > IOW, kernel will directly shutdown user space, not letting systemd to do
> > such job.
>
> And why are we doing it? I think we had discussed this in the past just
> that I can't remember the detail.
>
> Why shouldn't we go through regular reboot path. What's so special that
> we need to enforce "reboot -f" ourselves.
I don't remember either. I did some testing today. Actually talking to
systemd for reboot/poweroff/halt works fine.
I think we can switch to a regular reboot/poweroff/halt path. But it's
still worth for us to umount everything we mount early, right?
I am not sure if we need to umount everything or systemd will take care
of it in reboot path.
I'll do that after this patchset gets in.
Ok, that's fine. Once this patchset goes in, please put in another
patchset to make use of systemd reboot path.
Thanks
Vivek
3:14 a.m.
New subject: [PATCH v3 5/5] mkdumprd: append "x-initrd.mount" to the mount options.
Now when mount in /etc/fstab fails, systemd would not consider it as
critical and it would continue to boot. In fact, emergency service is
triggered, but not in a isolation mode, and it results in the emergency
service getting shutdown at some point later of the boot process. We
need isolation otherwise we won't see any emergency service.
That is because in kdump initramfs, mount units specified in /etc/fstab
are required by "local-fs.target". When any of these mounts fails,
local-fs.target fails.
For kdump initramfs, we need to isolate to emergency service on any of
the mount failure, that said, every service should be stopped and onlu
emergency service would run. But local-fs.target won't trigger that on
its failure. That means in case of mount failure, local-fs.target also
enters failure state, but all the service will continue without any
interruption.
After digging looking into source code of systemd-fstab-generator. I
find "x-initrd.mount" using in initramfs mount, will make the mount
units required by "initrd-root-fs.target" rather than it's used to be
"local-fs.target".
"initrd-root-fs.target" is suitable to us because if it fails, it will
isolate to emergency service. That means in case of any mount failure,
the emergeny service will start and everything else will stop. We want
this effect because we need to take kdump fail-safe action when there's
a mount failure.
From systemd unit point of view, "initrd-root-fs.target" has
OnFailureIsolate=yes, but "local-fs.target" doesn't. From
systemd.unit(5):
OnFailureIsolate=
Takes a boolean argument. If true, the unit listed in OnFailure=
will be enqueued in isolation mode, i.e. all units that are not its
dependency will be stopped. If this is set, only a single unit may
be listed in OnFailure=. Defaults to false.
NOTE: Harald who contributed "x-initrd.mount" in systemd, confirmed that
this feature will stay.
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
mkdumprd | 1 +
1 file changed, 1 insertion(+)
diff --git a/mkdumprd b/mkdumprd
index ba35800..a38d190 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -106,6 +106,7 @@ to_mount() {
_fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
_options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
_options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
+ _options="$_options,x-initrd.mount"
_mntopts="$_target $_fstype $_options"
#for non-nfs _dev converting to use udev persistent name
if [ -b "$_source" ]; then
--
1.9.3
1:25 p.m.
New subject: [PATCH v3 5/5] mkdumprd: append "x-initrd.mount" to the mount options.
On Fri, Jul 18, 2014 at 04:14:05PM +0800, WANG Chao wrote:
Now when mount in /etc/fstab fails, systemd would not consider it as
critical and it would continue to boot. In fact, emergency service is
triggered, but not in a isolation mode, and it results in the emergency
service getting shutdown at some point later of the boot process. We > need isolation
otherwise we won't see any emergency service.
That is because in kdump initramfs, mount units specified in /etc/fstab
are required by "local-fs.target". When any of these mounts fails,
local-fs.target fails.
For kdump initramfs, we need to isolate to emergency service on any of
the mount failure, that said, every service should be stopped and onlu
emergency service would run. But local-fs.target won't trigger that on
its failure. That means in case of mount failure, local-fs.target also
enters failure state, but all the service will continue without any
interruption.
After digging looking into source code of systemd-fstab-generator. I
find "x-initrd.mount" using in initramfs mount, will make the mount
units required by "initrd-root-fs.target" rather than it's used to be
"local-fs.target".
"initrd-root-fs.target" is suitable to us because if it fails, it will
isolate to emergency service. That means in case of any mount failure,
the emergeny service will start and everything else will stop. We want
this effect because we need to take kdump fail-safe action when there's
a mount failure.
>From systemd unit point of view, "initrd-root-fs.target" has
OnFailureIsolate=yes, but "local-fs.target" doesn't. From
systemd.unit(5):
OnFailureIsolate=
Takes a boolean argument. If true, the unit listed in OnFailure=
will be enqueued in isolation mode, i.e. all units that are not its
dependency will be stopped. If this is set, only a single unit may
be listed in OnFailure=. Defaults to false.
NOTE: Harald who contributed "x-initrd.mount" in systemd, confirmed that
this feature will stay.
Signed-off-by: WANG Chao <chaowang(a)redhat.com>
---
mkdumprd | 1 +
1 file changed, 1 insertion(+)
diff --git a/mkdumprd b/mkdumprd
index ba35800..a38d190 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -106,6 +106,7 @@ to_mount() {
_fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
_options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
_options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
+ _options="$_options,x-initrd.mount"
I think put few lines of consice comment in here to explain what x-initrd
is doing an why are we specifying it.
Thanks
Vivek
12:55 a.m.
New subject: [PATCH v3 5/5] mkdumprd: append "x-initrd.mount" to the mount options.
On 07/21/14 at 02:25pm, Vivek Goyal wrote:
On Fri, Jul 18, 2014 at 04:14:05PM +0800, WANG Chao wrote:
> Now when mount in /etc/fstab fails, systemd would not consider it as
> critical and it would continue to boot. In fact, emergency service is
> triggered, but not in a isolation mode, and it results in the emergency
> service getting shutdown at some point later of the boot process. We > need
isolation otherwise we won't see any emergency service.
>
> That is because in kdump initramfs, mount units specified in /etc/fstab
> are required by "local-fs.target". When any of these mounts fails,
> local-fs.target fails.
>
> For kdump initramfs, we need to isolate to emergency service on any of
> the mount failure, that said, every service should be stopped and onlu
> emergency service would run. But local-fs.target won't trigger that on
> its failure. That means in case of mount failure, local-fs.target also
> enters failure state, but all the service will continue without any
> interruption.
>
> After digging looking into source code of systemd-fstab-generator. I
> find "x-initrd.mount" using in initramfs mount, will make the mount
> units required by "initrd-root-fs.target" rather than it's used to be
> "local-fs.target".
>
> "initrd-root-fs.target" is suitable to us because if it fails, it will
> isolate to emergency service. That means in case of any mount failure,
> the emergeny service will start and everything else will stop. We want
> this effect because we need to take kdump fail-safe action when there's
> a mount failure.
>
> >From systemd unit point of view, "initrd-root-fs.target" has
> OnFailureIsolate=yes, but "local-fs.target" doesn't. From
> systemd.unit(5):
>
> OnFailureIsolate=
> Takes a boolean argument. If true, the unit listed in OnFailure=
> will be enqueued in isolation mode, i.e. all units that are not its
> dependency will be stopped. If this is set, only a single unit may
> be listed in OnFailure=. Defaults to false.
>
> NOTE: Harald who contributed "x-initrd.mount" in systemd, confirmed that
> this feature will stay.
>
> Signed-off-by: WANG Chao <chaowang(a)redhat.com>
> ---
> mkdumprd | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/mkdumprd b/mkdumprd
> index ba35800..a38d190 100644
> --- a/mkdumprd
> +++ b/mkdumprd
> @@ -106,6 +106,7 @@ to_mount() {
> _fstype=$(findmnt -k -f -n -r -o FSTYPE $_dev)
> _options=$(findmnt -k -f -n -r -o OPTIONS $_dev)
> _options=${_options/#ro/rw} #mount fs target as rw in 2nd kernel
> + _options="$_options,x-initrd.mount"
I think put few lines of consice comment in here to explain what x-initrd
is doing an why are we specifying it.
Sure. Will do.
3:55 a.m.
On 07/18/14 at 04:14pm, WANG Chao wrote:
Hi, All
Now upon failure kdump script might not be called at all and it might
not be able to execute default action. It results in a hang.
Because we disable emergency shell and rely on kdump.sh being invoked
through dracut-pre-pivot hook. But it might happen that we never call
into dracut-pre-pivot hook because certain systemd targets could not
reach due to failure in their dependencies. In those cases error
handling code does not run and system hangs.
To solve this problem, we need to separate the error handling code from
dracut-pre-pivot hook, and every time when a failure shows up, the
separated code can be called by the emergency service.
By default systemd provides an emergency service which will drop us into
shell every time upon a critical failure. It's very convenient for us to
re-use the framework of systemd emergency, because we don't have to
touch the other parts of systemd. We can use our own script instead of
the default one.
This new scheme will overwrite emergency shell and replace with kdump
error handling code. And this code will do the error handling as needed.
Now, we will not rely on dracut-pre-pivot hook running always. Instead
whenever error happens and it is serious enough that emergency shell
needed to run, now kdump error handler will run.
This patchset introduce a new kdump emergency service. It will override the
existing emergency.service. When fatal error occurs, this emergency service
will be triggered and systemd will isolate to emergency path.
This kdump emergency service can will read kdump.conf and act according to the
configired "default action" (reboot/poweroff/halt/shell/dump_to_rootfs).
Along with this patchset, kdump-capture.service is introduced as a service unit
to run kdump.sh. When kdump-capture.service fails, systemd will isolate to
kdump emergency service. I copied all the dependencies from
dracut-pre-pivot.service to kdump-capture.service so that kdump.sh will be
called at the correct time window.
v2:
Address several comments from Vivek:
- split [patch 1] into 1/6 and 2/6
- remove several unnecessary lines in service unit.
- modify the description of kdump-capture.service
- introduce another kdump lib kdump-lib-2.sh used in 2nd kernel.
V3:
Address several comments from Vivek:
- update description of [PATCH 1/5] and [PATCH 5/5]
- separate the patch of cleanup to kdump-lib-initramfs.sh
WANG Chao (5):
Introduce kdump error handling service
Introduce kdump capture service
disable dracut-emergency.service the whole time
mkdumprd: mount dump target under /sysroot in 2nd kernel
mkdumprd: append "x-initrd.mount" to the mount options.
dracut-kdump-capture.service | 23 +++++++++++++++++++++++
dracut-kdump-emergency.service | 23 +++++++++++++++++++++++
dracut-kdump-error-handler.sh | 10 ++++++++++
dracut-kdump.sh | 9 ++-------
dracut-module-setup.sh | 7 ++++++-
kexec-tools.spec | 7 ++++++-
mkdumprd | 25 +++++++++++++------------
7 files changed, 83 insertions(+), 21 deletions(-)
create mode 100644 dracut-kdump-capture.service
create mode 100644 dracut-kdump-emergency.service
create mode 100755 dracut-kdump-error-handler.sh
--
1.9.3
_______________________________________________
kexec mailing list
kexec(a)lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/kexec
nickpick about 1/5 and 3/5, see inline comments. Otherwise
Ack the patchset.
It's much clear than previous version, thanks
Dave
3558
days inactive
3564
days old
21 comments
3 participants
participants (3)
-
Dave Young -
Vivek Goyal -
WANG Chao