From: Amitay Isaacs <amitay@gmail.com>
Date: Tue, 19 Jul 2016 07:17:04 +0000 (+1000)
Subject: ctdb-tool: Remove ctdb thaw command
X-Git-Tag: tdb-1.3.10~139
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c933b14366658074499116e8ef682c230cbe1fe;p=thirdparty%2Fsamba.git

ctdb-tool: Remove ctdb thaw command

Databases should never be thawed manually.  A database recovery will
correctly thaw all databases.  Otherwise there is a bug in the database
recovery.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index bbe102fdb44..024fb135cf9 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -1659,14 +1659,6 @@ HEALTH: NO-HEALTHY-NODES - ERROR - Backup of corrupted TDB in '/usr/local/var/li
       </para>
     </refsect2>
 
-    <refsect2>
-      <title>thaw</title>
-      <para>
-	Thaw a previously frozen node.
-      </para>
-    </refsect2>
-
-
     <refsect2>
       <title>eventscript <parameter>ARGUMENTS</parameter></title>
       <para>
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 8ea2fbce9fc..da8356d3fdb 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -4309,30 +4309,6 @@ static int control_setdebug(struct ctdb_context *ctdb, int argc, const char **ar
 	return 0;
 }
 
-
-/*
-  thaw a node
- */
-static int control_thaw(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,("Thaw by priority %u\n", priority));
-
-	ret = ctdb_ctrl_thaw_priority(ctdb, TIMELIMIT(), options.pnn, priority);
-	if (ret != 0) {
-		DEBUG(DEBUG_ERR, ("Unable to thaw node %u\n", options.pnn));
-	}		
-	return 0;
-}
-
-
 /*
   attach to a database
  */
@@ -5767,7 +5743,6 @@ static const struct {
 	{ "recover",         control_recover,           true,	false,  "force recovery" },
 	{ "sync", 	     control_ipreallocate,      false,	false,  "wait until ctdbd has synced all state changes" },
 	{ "ipreallocate",    control_ipreallocate,      false,	false,  "force the recovery daemon to perform a ip reallocation procedure" },
-	{ "thaw",            control_thaw,              true,	false,  "thaw databases", "[priority:1-3]" },
 	{ "isnotrecmaster",  control_isnotrecmaster,    false,	false,  "check if the local node is recmaster or not" },
 	{ "gratiousarp",     control_gratious_arp,      false,	false, "send a gratious arp", "<ip> <interface>" },
 	{ "tickle",          tickle_tcp,                false,	false, "send a tcp tickle ack", "<srcip:port> <dstip:port>" },