File 0002-Medium-CTDB-Add-smb_fileid_algorithm-param... of Package resource-agents

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Medium-CTDB-Add-smb_fileid_algorithm-parameter-defau.patch of Package resource-agents (Revision f8f47bba2da81767035a0e151d5b57e7)

Currently displaying revision f8f47bba2da81767035a0e151d5b57e7 , Show latest

From 1fe8079c11d7b0c9045678566b727d74e302f770 Mon Sep 17 00:00:00 2001
From: Tim Serong <tserong@novell.com>
Date: Wed, 22 Jan 2014 10:36:07 +0100
Subject: [PATCH 2/4] Medium: CTDB: Add smb_fileid_algorithm parameter,
 default=fsid (bnc#696978)

---
 heartbeat/CTDB | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/heartbeat/CTDB b/heartbeat/CTDB
index 0aaddd54ef83..3bb9921c8c77 100755
--- a/heartbeat/CTDB
+++ b/heartbeat/CTDB
@@ -311,7 +311,7 @@ for OCFS2, this should be set to "fsid".  Only necessary if
 CTDB is managing Samba.
 </longdesc>
 <shortdesc lang="en">Samba VFS fileid algorithm</shortdesc>
-<content type="string" default="" />
+<content type="string" default="fsid" />
 </parameter>
 
 </parameters>
@@ -339,6 +339,18 @@ elif [ -f $OCF_RESKEY_ctdb_config_dir/ctdb ]; then
 	CTDB_SYSCONFIG=$OCF_RESKEY_ctdb_config_dir/ctdb
 fi
 
+if [ -n "$CTDB_SYSCONFIG" ]; then
+	# Automatically set default fileid:algorithm if:
+	# - the RA has never been run before (/etc/sysconfig/ctdb doesn't
+	#   include our autogenerated comment)
+	# - the RA has been run before, with a version of the RA that supports
+	#   this option.
+	if ! grep -qa '# CTDB-RA: Auto-generated' $CTDB_SYSCONFIG || \
+	   grep -qa '# CTDB-RA: supports fileid' $CTDB_SYSCONFIG; then
+		: ${OCF_RESKEY_smb_fileid_algorithm:=fsid}
+	fi
+fi
+
 # Backup paths
 CTDB_SYSCONFIG_BACKUP=${CTDB_SYSCONFIG}.ctdb-ra-orig
 
@@ -475,6 +487,17 @@ generate_ctdb_sysconfig() {
 
 	ocf_log info "Generating new $CTDB_SYSCONFIG"
 
+	# We need a "supports fileid" tag in /etc/sysconfig/ctdb, so we can
+	# automatically set smb_fileid_algorithm to a sensible default value
+	# if this tag is present.  But we must not include this tag if the
+	# RA has been invoked previously, and has generated a config file
+	# that does not contain this tag, lest we break rolling upgrade.
+	local supports_fileid='# CTDB-RA: supports fileid'
+	if grep -qa '# CTDB-RA: Auto-generated' $CTDB_SYSCONFIG && \
+	   ! grep -qa '# CTDB-RA: supports fileid' $CTDB_SYSCONFIG; then
+		supports_fileid='# CTDB-RA: smb_fileid_algorithm must be set manually'
+	fi
+
 	# Note to maintainers and other random hackers:
 	# Parameters may need to be set here, for CTDB event
 	# scripts to pick up, or may need to be passed to ctdbd
@@ -486,6 +509,7 @@ generate_ctdb_sysconfig() {
 
 	cat >$CTDB_SYSCONFIG <<EOF
 # CTDB-RA: Auto-generated by ${0}, backup is at $CTDB_SYSCONFIG_BACKUP
+$supports_fileid
 CTDB_MONITOR_FREE_MEMORY=$OCF_RESKEY_ctdb_monitor_free_memory
 CTDB_SAMBA_SKIP_SHARE_CHECK=$(ocf_is_true "$OCF_RESKEY_ctdb_samba_skip_share_check" && echo 'yes' || echo 'no')
 CTDB_MANAGES_SAMBA=$(ocf_is_true "$OCF_RESKEY_ctdb_manages_samba" && echo 'yes' || echo 'no')
-- 
1.8.4

Places

File 0002-Medium-CTDB-Add-smb_fileid_algorithm-parameter-defau.patch of Package resource-agents (Revision f8f47bba2da81767035a0e151d5b57e7)

Places