[SCM] CTDB repository - branch master updated - ctdb-1.0.114-202-g79ef990

[Ronnie Sahlberg]

The branch, master has been updated
       via  79ef9909dfa0904d789c69eb6b9c80e8908a1100 (commit)
       via  bd005b987255eb65cd3826dce984281ee757daf6 (commit)
      from  8b883eb9346b8278d268e35b56ac680cd9526b97 (commit)

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


- Log -----------------------------------------------------------------
commit 79ef9909dfa0904d789c69eb6b9c80e8908a1100
Author: Ronnie Sahlberg <sahlberg at sahlberg-laptop.(none)>
Date:   Thu Aug 5 16:35:37 2010 +1000

    iupdate the docs that ctdb freeze is no more

commit bd005b987255eb65cd3826dce984281ee757daf6
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Aug 5 16:30:47 2010 +1000

     remove the "ctdb freeze" debugging command

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

Summary of changes:
 doc/ctdb.1     |   11 +++--------
 doc/ctdb.1.xml |   13 -------------
 tools/ctdb.c   |   23 -----------------------
 3 files changed, 3 insertions(+), 44 deletions(-)


Changeset truncated at 500 lines:

diff --git a/doc/ctdb.1 b/doc/ctdb.1
index 358f011..70e150c 100644
--- a/doc/ctdb.1
+++ b/doc/ctdb.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: ctdb
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 05/20/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
+.\"      Date: 08/05/2010
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB" "1" "05/20/2010" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB" "1" "08/05/2010" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -917,11 +917,6 @@ This is a debugging command\&. This command will make the ctdb daemon to write a
 .SS "rddumpmemory"
 .PP
 This is a debugging command\&. This command will dump the talloc memory allocation tree for the recovery daemon to standard output\&.
-.SS "freeze"
-.PP
-This command will lock all the local TDB databases causing clients that are accessing these TDBs such as samba3 to block until the databases are thawed\&.
-.PP
-This is primarily used by the recovery daemon to stop all samba daemons from accessing any databases while the database is recovered and rebuilt\&.
 .SS "thaw"
 .PP
 Thaw a previously frozen node\&.
diff --git a/doc/ctdb.1.xml b/doc/ctdb.1.xml
index 55d8fc8..31832a3 100644
--- a/doc/ctdb.1.xml
+++ b/doc/ctdb.1.xml
@@ -1218,19 +1218,6 @@ HEALTH: NO-HEALTHY-NODES - ERROR - Backup of corrupted TDB in '/var/ctdb/persist
       </para>
     </refsect2>
 
-    <refsect2><title>freeze</title>
-      <para>
-        This command will lock all the local TDB databases causing clients 
-        that are accessing these TDBs such as samba3 to block until the
-        databases are thawed.
-      </para>
-      <para>
-        This is primarily used by the recovery daemon to stop all samba
-        daemons from accessing any databases while the database is recovered
-        and rebuilt.
-      </para>
-    </refsect2>
-
     <refsect2><title>thaw</title>
       <para>
         Thaw a previously frozen node.
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 4b81df7..336c790 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -3273,28 +3273,6 @@ static int control_setdebug(struct ctdb_context *ctdb, int argc, const char **ar
 
 
 /*
-  freeze a node
- */
-static int control_freeze(struct ctdb_context *ctdb, int argc, const char **argv)
-{
-	int ret;
-	uint32_t priority;
-	
-	if (argc == 1) {
-		priority = strtol(argv[0], NULL, 0);
-	} else {
-		priority = 0;
-	}
-	DEBUG(DEBUG_ERR,("Freeze by priority %u\n", priority));
-
-	ret = ctdb_ctrl_freeze_priority(ctdb, TIMELIMIT(), options.pnn, priority);
-	if (ret != 0) {
-		DEBUG(DEBUG_ERR, ("Unable to freeze node %u\n", options.pnn));
-	}		
-	return 0;
-}
-
-/*
   thaw a node
  */
 static int control_thaw(struct ctdb_context *ctdb, int argc, const char **argv)
@@ -4401,7 +4379,6 @@ static const struct {
 	{ "shutdown",        control_shutdown,          true,	false,  "shutdown ctdbd" },
 	{ "recover",         control_recover,           true,	false,  "force recovery" },
 	{ "ipreallocate",    control_ipreallocate,      true,	false,  "force the recovery daemon to perform a ip reallocation procedure" },
-	{ "freeze",          control_freeze,            true,	false,  "freeze databases", "[priority:1-3]" },
 	{ "thaw",            control_thaw,              true,	false,  "thaw databases", "[priority:1-3]" },
 	{ "isnotrecmaster",  control_isnotrecmaster,    false,	false,  "check if the local node is recmaster or not" },
 	{ "killtcp",         kill_tcp,                  false,	false, "kill a tcp connection.", "<srcip:port> <dstip:port>" },


-- 
CTDB repository