2022-02-17 22:30:53

by Wenchao Hao

[permalink] [raw]
Subject: [PATCH] idmapd: Fix error status when nfs-idmapd exits

nfs-idmapd.service would report following error when stopped:

Feb 17 07:32:05 fedora systemd[1]: Starting NFSv4 ID-name mapping service...
Feb 17 07:32:05 fedora rpc.idmapd[1198]: Setting log level to 0
Feb 17 07:32:05 fedora systemd[1]: Started NFSv4 ID-name mapping service.
Feb 17 07:32:11 fedora rpc.idmapd[1198]: exiting on signal 15
Feb 17 07:32:11 fedora systemd[1]: Stopping NFSv4 ID-name mapping service...
Feb 17 07:32:11 fedora systemd[1]: nfs-idmapd.service: Main process exited, code=exited, status=1/FAILURE
Feb 17 07:32:11 fedora systemd[1]: nfs-idmapd.service: Failed with result 'exit-code'.
Feb 17 07:32:11 fedora systemd[1]: Stopped NFSv4 ID-name mapping service.

commit 93e8f092(idmapd: Add graceful exit and resource cleanup)
redirected SIGTERM, so when executing "systemctl stop nfs-idmapd", the
main() of idmapd would running to tail to return, while it returned 1
which considered as error by systemd.

So here just return 0 in main().

Signed-off-by: Wenchao Hao <[email protected]>
---
utils/idmapd/idmapd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index e2c160e8..e79c124d 100644
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -474,7 +474,7 @@ main(int argc, char **argv)
event_free(svrdirev);
event_base_free(evbase);

- return 1;
+ return 0;
}

static void
--
2.32.0


2022-02-24 01:13:26

by Steve Dickson

[permalink] [raw]
Subject: Re: [PATCH] idmapd: Fix error status when nfs-idmapd exits



On 2/17/22 8:27 PM, Wenchao Hao wrote:
> nfs-idmapd.service would report following error when stopped:
>
> Feb 17 07:32:05 fedora systemd[1]: Starting NFSv4 ID-name mapping service...
> Feb 17 07:32:05 fedora rpc.idmapd[1198]: Setting log level to 0
> Feb 17 07:32:05 fedora systemd[1]: Started NFSv4 ID-name mapping service.
> Feb 17 07:32:11 fedora rpc.idmapd[1198]: exiting on signal 15
> Feb 17 07:32:11 fedora systemd[1]: Stopping NFSv4 ID-name mapping service...
> Feb 17 07:32:11 fedora systemd[1]: nfs-idmapd.service: Main process exited, code=exited, status=1/FAILURE
> Feb 17 07:32:11 fedora systemd[1]: nfs-idmapd.service: Failed with result 'exit-code'.
> Feb 17 07:32:11 fedora systemd[1]: Stopped NFSv4 ID-name mapping service.
>
> commit 93e8f092(idmapd: Add graceful exit and resource cleanup)
> redirected SIGTERM, so when executing "systemctl stop nfs-idmapd", the
> main() of idmapd would running to tail to return, while it returned 1
> which considered as error by systemd.
>
> So here just return 0 in main().
>
> Signed-off-by: Wenchao Hao <[email protected]>
Committed (tag: nfs-utils-2-6-2-rc2)

steved.
> ---
> utils/idmapd/idmapd.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
> index e2c160e8..e79c124d 100644
> --- a/utils/idmapd/idmapd.c
> +++ b/utils/idmapd/idmapd.c
> @@ -474,7 +474,7 @@ main(int argc, char **argv)
> event_free(svrdirev);
> event_base_free(evbase);
>
> - return 1;
> + return 0;
> }
>
> static void