[SCM] CTDB repository - branch master updated - ctdb-1.13-271-g043ef77

[Amitay Isaacs]

The branch, master has been updated
       via  043ef77086797a703aec436a26a05c56a1bcbf2b (commit)
       via  dc2a8c638bd74b9f1dd75339cd2ae2f32ffa18a8 (commit)
       via  b89e959904d7d1b0e5525abd7789f5101537a46a (commit)
      from  6bd4feff7039138d435428eeded51975c44e567c (commit)

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


- Log -----------------------------------------------------------------
commit 043ef77086797a703aec436a26a05c56a1bcbf2b
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Aug 21 14:28:37 2012 +1000

    Initscript: Kill any existing ctdbd processes if the ping succeeds
    
    Initialising a new ctdbd will destroy the Unix domain socket so
    existing processes will be useless anyway.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit dc2a8c638bd74b9f1dd75339cd2ae2f32ffa18a8
Author: Martin Schwenke <martin at meltin.net>
Date:   Mon Aug 20 15:02:24 2012 +1000

    tools/ctdb: Free the event context
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit b89e959904d7d1b0e5525abd7789f5101537a46a
Author: Martin Schwenke <martin at meltin.net>
Date:   Mon Aug 20 14:30:35 2012 +1000

    libctdb: Add comments to effect that some controls return result in status
    
    These controls include:
    
      CTDB_CONTROL_GET_RECMODE
      CTDB_CONTROL_GET_RECMASTER
      CTDB_CONTROL_GET_PID
      CTDB_CONTROL_GET_PNN
      CTDB_CONTROL_PING
      CTDB_CONTROL_GET_DB_PRIORITY
    
    In these cases the data field is empty.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

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

Summary of changes:
 config/ctdb.init  |    6 ++++++
 libctdb/control.c |    3 +++
 tools/ctdb.c      |    1 +
 3 files changed, 10 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.init b/config/ctdb.init
index 71b187a..581844d 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -257,6 +257,12 @@ start() {
 	return 0
     }
 
+    # About to start new $ctdbd.  The ping above has failed and any
+    # new $ctdbd will destroy the Unix domain socket, so any processes
+    # that aren't yet completely useless soon will be...  so kill
+    # them.
+    pkill -9 -f "$ctdbd"
+
     build_ctdb_options
 
     # make sure we drop any ips that might still be held if previous
diff --git a/libctdb/control.c b/libctdb/control.c
index 176c48c..8d14cc8 100644
--- a/libctdb/control.c
+++ b/libctdb/control.c
@@ -48,6 +48,7 @@ bool ctdb_getrecmaster_recv(struct ctdb_connection *ctdb,
 		DEBUG(ctdb, LOG_ERR, "ctdb_getrecmaster_recv: status -1");
 		return false;
 	}
+	/* Note: data is stashed in status - see ctdb_control_dispatch() */
 	*recmaster = reply->status;
 	return true;
 }
@@ -75,6 +76,7 @@ bool ctdb_getrecmode_recv(struct ctdb_connection *ctdb,
 		DEBUG(ctdb, LOG_ERR, "ctdb_getrecmode_recv: status -1");
 		return false;
 	}
+	/* Note: data is stashed in status - see ctdb_control_dispatch() */
 	*recmode = reply->status;
 	return true;
 }
@@ -102,6 +104,7 @@ bool ctdb_getpnn_recv(struct ctdb_connection *ctdb,
 		DEBUG(ctdb, LOG_ERR, "ctdb_getpnn_recv: status -1");
 		return false;
 	}
+	/* Note: data is stashed in status - see ctdb_control_dispatch() */
 	*pnn = reply->status;
 	return true;
 }
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 6d5dc1b..e75a922 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -6019,6 +6019,7 @@ int main(int argc, const char *argv[])
 
 	ctdb_disconnect(ctdb_connection);
 	talloc_free(ctdb);
+	talloc_free(ev);
 	(void)poptFreeContext(pc);
 
 	return ret;


-- 
CTDB repository