[SCM] CTDB repository - branch master updated - 17b1e3b2d72c453a0b2f5a783c28f9dd17334620

[Andrew Tridgell]

The branch, master has been updated
       via  17b1e3b2d72c453a0b2f5a783c28f9dd17334620 (commit)
       via  947bcc76ff0e90b613f20246be67ff014098a74d (commit)
       via  f4385712134ea783a0c79a687c5d4e6faa1cc4a7 (commit)
      from  e8f3431597bc9ec67387ea7e702d2d00f36007f0 (commit)

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


- Log -----------------------------------------------------------------
commit 17b1e3b2d72c453a0b2f5a783c28f9dd17334620
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu May 8 19:52:27 2008 +1000

    fix merge corruption

commit 947bcc76ff0e90b613f20246be67ff014098a74d
Merge: f4385712134ea783a0c79a687c5d4e6faa1cc4a7 e8f3431597bc9ec67387ea7e702d2d00f36007f0
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu May 8 17:49:48 2008 +1000

    Merge git://git.samba.org/tridge/ctdb

commit f4385712134ea783a0c79a687c5d4e6faa1cc4a7
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu May 8 06:52:53 2008 +1000

    From Mathias Dietz
    
    Make the 60.nfs eventscript more forgiving when using non-us/english
    characters in sharenames

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

Summary of changes:
 config/events.d/60.nfs |    2 +-
 tools/ctdb.c           |   78 ------------------------------------------------
 2 files changed, 1 insertions(+), 79 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index c84e7be..182d250 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -96,7 +96,7 @@ case $cmd in
 	ctdb_check_rpc "NFS" 100003 3
 
 	# and that its directories are available
-	nfs_dirs=$(grep -v '^#' < /etc/exports | awk {'print $1;'})
+	nfs_dirs=$(exportfs | grep -v '^#' | awk {'print $1;'})
 	ctdb_check_directories "nfs" $nfs_dirs
 
 	# check that lockd responds to rpc requests
diff --git a/tools/ctdb.c b/tools/ctdb.c
index f6f0745..6f78b65 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -997,84 +997,6 @@ static int tickle_tcp(struct ctdb_context *ctdb, int argc, const char **argv)
 }
 
 
-struct node_ip {
-	uint32_t pnn;
-	struct sockaddr_in sin;
-};
-
-void getips_store_callback(void *param, void *data)
-{
-	struct node_ip *node_ip = (struct node_ip *)data;
-	struct ctdb_all_public_ips *ips = param;
-	int i;
-
-	i = ips->num++;
-	ips->ips[i].pnn = node_ip->pnn;
-	ips->ips[i].sin = node_ip->sin;
-}
-
-void getips_count_callback(void *param, void *data)
-{
-	uint32_t *count = param;
-
-	(*count)++;
-}
-
-static int
-control_get_all_public_ips(struct ctdb_context *ctdb, TALLOC_CTX *tmp_ctx, struct ctdb_all_public_ips **ips)
-{
-	struct ctdb_all_public_ips *tmp_ips;
-	struct ctdb_node_map *nodemap=NULL;
-	trbt_tree_t *tree;
-	int i, j, len, ret;
-	uint32_t count;
-
-	ret = ctdb_ctrl_getnodemap(ctdb, TIMELIMIT(), CTDB_CURRENT_NODE, tmp_ctx, &nodemap);
-	if (ret != 0) {
-		DEBUG(DEBUG_ERR, ("Unable to get nodemap from node %u\n", options.pnn));
-		return ret;
-	}
-
-	tree = trbt_create(tmp_ctx, 0);
-
-	for(i=0;i<nodemap->num;i++){
-		if (nodemap->nodes[i].flags & NODE_FLAGS_DISCONNECTED) {
-			continue;
-		}
-
-		/* read the public ip list from this node */
-		ret = ctdb_ctrl_get_public_ips(ctdb, TIMELIMIT(), nodemap->nodes[i].pnn, tmp_ctx, &tmp_ips);
-		if (ret != 0) {
-			DEBUG(DEBUG_ERR, ("Unable to get public ip list from node %u\n", nodemap->nodes[i].pnn));
-			return -1;
-		}
-	
-		for (j=0; j<tmp_ips->num;j++) {
-			struct node_ip *node_ip;
-
-			node_ip = talloc(tmp_ctx, struct node_ip);
-			node_ip->pnn = tmp_ips->ips[j].pnn;
-			node_ip->sin = tmp_ips->ips[j].sin;
-
-			trbt_insert32(tree, tmp_ips->ips[j].sin.sin_addr.s_addr, node_ip);
-		}
-		talloc_free(tmp_ips);
-	}
-
-	/* traverse */
-	count = 0;
-	trbt_traversearray32(tree, 1, getips_count_callback, &count);
-
-	len = offsetof(struct ctdb_all_public_ips, ips) + 
-		count*sizeof(struct ctdb_public_ip);
-	tmp_ips = talloc_zero_size(tmp_ctx, len);
-	trbt_traversearray32(tree, 1, getips_store_callback, tmp_ips);
-
-	*ips = tmp_ips;
-
-	return 0;
-}
-
 /*
   display public ip status
  */


-- 
CTDB repository