[SCM] CTDB repository - branch master updated - ctdb-1.0.65-10-g03e2e43

[Ronnie Sahlberg]

The branch, master has been updated
       via  03e2e436db5cfd29a56d13f5d2101e42389bfc94 (commit)
       via  dab594caf0bfc23c75c8cd2aa75479c7d2e79f1c (commit)
      from  6579a6a2a7161214adedf0f67dce62f4a4ad1afe (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 03e2e436db5cfd29a56d13f5d2101e42389bfc94
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Nov 21 16:24:12 2008 +1100

    allow to change the recmaster even the database is not frozen

commit dab594caf0bfc23c75c8cd2aa75479c7d2e79f1c
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Nov 21 11:30:32 2008 +1100

    remove two variables no longer used from the example sysconfig file

-----------------------------------------------------------------------

Summary of changes:
 config/ctdb.sysconfig |    8 --------
 server/ctdb_recover.c |    5 +----
 2 files changed, 1 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index 35a9819..d0d9f75 100644
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -42,14 +42,6 @@
 # default is to not manage Samba
 # CTDB_MANAGES_SAMBA=yes
 
-# should we skip the check of whether the shares that samba is exporting
-# is available or not. This may be useful if there are a huge number of shares
-# since checking each one of them might take a long time.
-# CTDB_SAMBA_SKIP_SHARE_CHECK="yes"
-
-# should we skip checking smb.conf for consistency
-# CTDB_SAMBA_SKIP_CONF_CHECK="yes"
-
 # specify which ports we should check that there is a daemon listening to
 # by default we use testparm and look in smb.conf to figure out.
 # CTDB_SAMBA_CHECK_PORTS="445"
diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index 39b73ac..9be2eb2 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -1085,10 +1085,7 @@ int32_t ctdb_control_recd_ping(struct ctdb_context *ctdb)
 int32_t ctdb_control_set_recmaster(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA indata)
 {
 	CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t));
-	if (ctdb->freeze_mode != CTDB_FREEZE_FROZEN) {
-		DEBUG(DEBUG_NOTICE,("Attempt to set recmaster when not frozen\n"));
-		return -1;
-	}
+
 	ctdb->recovery_master = ((uint32_t *)(&indata.dptr[0]))[0];
 	return 0;
 }


-- 
CTDB repository