diff mbox series

[v2] tools: remove unused sysconfig variable XENSTORED_ROOTDIR

Message ID 20210506151631.1227-1-olaf@aepfle.de (mailing list archive)
State New
Headers show
Series [v2] tools: remove unused sysconfig variable XENSTORED_ROOTDIR | expand

Commit Message

Olaf Hering May 6, 2021, 3:16 p.m. UTC
The sysconfig variable XENSTORED_ROOTDIR is not used anymore.
It used to point to a directory with tdb files, which is now a tmpfs.

In case the database is not in tmpfs, like on sysv and BSD systems,
xenstored will truncate existing database files during start.

Fixes commit 2ef6ace428dec4795b8b0a67fff6949e817013de

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 tools/hotplug/FreeBSD/rc.d/xencommons.in           | 5 -----
 tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 7 -------
 tools/hotplug/Linux/launch-xenstore.in             | 1 -
 tools/hotplug/NetBSD/rc.d/xencommons.in            | 5 -----
 4 files changed, 18 deletions(-)

Comments

Andrew Cooper May 6, 2021, 4:49 p.m. UTC | #1
On 06/05/2021 16:16, Olaf Hering wrote:
> The sysconfig variable XENSTORED_ROOTDIR is not used anymore.
> It used to point to a directory with tdb files, which is now a tmpfs.
>
> In case the database is not in tmpfs, like on sysv and BSD systems,
> xenstored will truncate existing database files during start.
>
> Fixes commit 2ef6ace428dec4795b8b0a67fff6949e817013de
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>

Acked-by Andrew Cooper <andrew.cooper3@citrix.com>, although as we're
trying to keep on top of the changelog this time around, we probably
want the following hunk:

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0106fccec1..6896d70757 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a
Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [unstable
UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging)
- TBD
 
+### Removed
+ - XENSTORED_ROOTDIR environment variable from configuration files and
+   initscripts, due to being unused.
+
 ## [4.15.0
UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.15.0)
- TBD
 
 ### Added / support upgraded

~Andrew
Andrew Cooper May 12, 2021, 2:52 p.m. UTC | #2
On 06/05/2021 17:49, Andrew Cooper wrote:
> On 06/05/2021 16:16, Olaf Hering wrote:
>> The sysconfig variable XENSTORED_ROOTDIR is not used anymore.
>> It used to point to a directory with tdb files, which is now a tmpfs.
>>
>> In case the database is not in tmpfs, like on sysv and BSD systems,
>> xenstored will truncate existing database files during start.
>>
>> Fixes commit 2ef6ace428dec4795b8b0a67fff6949e817013de
>>
>> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> Acked-by Andrew Cooper <andrew.cooper3@citrix.com>, although as we're
> trying to keep on top of the changelog this time around, we probably
> want the following hunk:
>
> diff --git a/CHANGELOG.md b/CHANGELOG.md
> index 0106fccec1..6896d70757 100644
> --- a/CHANGELOG.md
> +++ b/CHANGELOG.md
> @@ -6,6 +6,10 @@ The format is based on [Keep a
> Changelog](https://keepachangelog.com/en/1.0.0/)
>  
>  ## [unstable
> UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging)
> - TBD
>  
> +### Removed
> + - XENSTORED_ROOTDIR environment variable from configuration files and
> +   initscripts, due to being unused.
> +
>  ## [4.15.0
> UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.15.0)
> - TBD
>  
>  ### Added / support upgraded
>
> ~Andrew

Olaf: View on the above?

~Andrew
Olaf Hering May 12, 2021, 3:07 p.m. UTC | #3
Am Wed, 12 May 2021 15:52:16 +0100
schrieb Andrew Cooper <andrew.cooper3@citrix.com>:

> Olaf: View on the above?

I'm fine with the additional CHANGELOG.md change.
I thought the suggested addition is obvious.

Olaf
Andrew Cooper May 12, 2021, 3:24 p.m. UTC | #4
On 12/05/2021 16:07, Olaf Hering wrote:
> Am Wed, 12 May 2021 15:52:16 +0100
> schrieb Andrew Cooper <andrew.cooper3@citrix.com>:
>
>> Olaf: View on the above?
> I'm fine with the additional CHANGELOG.md change.
> I thought the suggested addition is obvious.

Thanks, but as I'm folding it into your patch, I shouldn't do it
unilaterally without someone else saying ok.

As it happens, Wei offered his A-by on IRC for the change, so I'll go
ahead as suggested.

~Andrew
diff mbox series

Patch

diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in
index 4c61d8c94e..fddcce314c 100644
--- a/tools/hotplug/FreeBSD/rc.d/xencommons.in
+++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in
@@ -42,11 +42,6 @@  xen_startcmd()
 
 	xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${XENSTORED})
 	if test -z "$xenstored_pid"; then
-		printf "Cleaning xenstore database.\n"
-		if [ -z "${XENSTORED_ROOTDIR}" ]; then
-			XENSTORED_ROOTDIR="@XEN_LIB_STORED@"
-		fi
-		rm -f ${XENSTORED_ROOTDIR}/tdb* >/dev/null 2>&1
 		printf "Starting xenservices: xenstored, xenconsoled."
 		XENSTORED_ARGS=" --pid-file ${XENSTORED_PIDFILE}"
 		if [ -n "${XENSTORED_TRACE}" ]; then
diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
index b059a2910d..00cf7f91d4 100644
--- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
+++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in
@@ -48,13 +48,6 @@  XENSTORED_ARGS=
 # Only evaluated if XENSTORETYPE is "daemon".
 #XENSTORED_TRACE=[yes|on|1]
 
-## Type: string
-## Default: "@XEN_LIB_STORED@"
-#
-# Running xenstored on XENSTORED_ROOTDIR
-# Only evaluated if XENSTORETYPE is "daemon".
-#XENSTORED_ROOTDIR=@XEN_LIB_STORED@
-
 ## Type: string
 ## Default: @LIBEXEC@/boot/xenstore-stubdom.gz
 #
diff --git a/tools/hotplug/Linux/launch-xenstore.in b/tools/hotplug/Linux/launch-xenstore.in
index fa4ea4af49..d40c66482a 100644
--- a/tools/hotplug/Linux/launch-xenstore.in
+++ b/tools/hotplug/Linux/launch-xenstore.in
@@ -66,7 +66,6 @@  test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF
 [ "$XENSTORETYPE" = "" ] && XENSTORETYPE=daemon
 
 [ "$XENSTORETYPE" = "daemon" ] && {
-	[ -z "$XENSTORED_ROOTDIR" ] && XENSTORED_ROOTDIR="@XEN_LIB_STORED@"
 	[ -z "$XENSTORED_TRACE" ] || XENSTORED_ARGS="$XENSTORED_ARGS -T @XEN_LOG_DIR@/xenstored-trace.log"
 	[ -z "$XENSTORED" ] && XENSTORED=@XENSTORED@
 	[ -x "$XENSTORED" ] || {
diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in
index 80e518f5de..cf2af06596 100644
--- a/tools/hotplug/NetBSD/rc.d/xencommons.in
+++ b/tools/hotplug/NetBSD/rc.d/xencommons.in
@@ -38,11 +38,6 @@  xen_startcmd()
 
 	xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored)
 	if test -z "$xenstored_pid"; then
-		printf "Cleaning xenstore database.\n"
-		if [ -z "${XENSTORED_ROOTDIR}" ]; then
-			XENSTORED_ROOTDIR="@XEN_LIB_STORED@"
-		fi
-		rm -f ${XENSTORED_ROOTDIR}/tdb* >/dev/null 2>&1
 		printf "Starting xenservices: xenstored, xenconsoled."
 		XENSTORED_ARGS=" --pid-file ${XENSTORED_PIDFILE}"
 		if [ -n "${XENSTORED_TRACE}" ]; then