add a control to read the vnnmap configuration from a node

add support in ctdb_control to fetch this information from a node

(This used to be ctdb commit 8d7f26c8d78d30c3ccb15a28ddea940d8666e052)

diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c
index 77102d2aae35e396861bdebb87a5e17de3d273a0..0957956cece6dbc4a24b5f0448650758b71fd2d5 100644 (file)
--- a/ctdb/common/ctdb_client.c
+++ b/ctdb/common/ctdb_client.c
@@ -781,6 +781,38 @@ int ctdb_status(struct ctdb_context *ctdb, uint32_t destnode, struct ctdb_status
        return 0;
 }
 
+/*
+  get vnn map from a remote node
+ */
+int ctdb_getvnnmap(struct ctdb_context *ctdb, uint32_t destnode, struct ctdb_vnn_map *vnnmap)
+{
+       int ret;
+       TDB_DATA data, outdata;
+       int32_t i, res;
+
+       ZERO_STRUCT(data);
+       ret = ctdb_control(ctdb, destnode, 0, 
+                          CTDB_CONTROL_GETVNNMAP, data, 
+                          ctdb, &outdata, &res);
+       if (ret != 0 || res != 0) {
+               DEBUG(0,(__location__ " ctdb_control for getvnnmap failed\n"));
+               return -1;
+       }
+
+       vnnmap->generation = ((uint32_t *)outdata.dptr)[0];
+       vnnmap->size = ((uint32_t *)outdata.dptr)[1];
+       if (vnnmap->map) {
+               talloc_free(vnnmap->map);
+               vnnmap->map = NULL;
+       }
+       vnnmap->map = talloc_array(vnnmap, uint32_t, vnnmap->size);
+       for (i=0;i<vnnmap->size;i++) {
+               vnnmap->map[i] = ((uint32_t *)outdata.dptr)[i+2];
+       }
+                   
+       return 0;
+}
+
 /*
   ping a node
  */

diff --git a/ctdb/common/ctdb_control.c b/ctdb/common/ctdb_control.c
index c68bbc2ae389ea78cc087017df22eedc74dadc41..1f296945242709a0e544ee0ceb5045c6758078ab 100644 (file)
--- a/ctdb/common/ctdb_control.c
+++ b/ctdb/common/ctdb_control.c
@@ -57,6 +57,22 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                return 0;
        }
 
+       case CTDB_CONTROL_GETVNNMAP: {
+               uint32_t i, len;
+
+               len = 2+ctdb->vnn_map->size;
+               outdata->dsize = 4*len;
+               outdata->dptr = (unsigned char *)talloc_array(outdata, uint32_t, len);
+               
+               ((uint32_t *)outdata->dptr)[0] = ctdb->vnn_map->generation;
+               ((uint32_t *)outdata->dptr)[1] = ctdb->vnn_map->size;
+               for (i=0;i<ctdb->vnn_map->size;i++) {
+                       ((uint32_t *)outdata->dptr)[i+2] = ctdb->vnn_map->map[i];
+               }
+
+               return 0;
+       }
+
        case CTDB_CONTROL_CONFIG: {
                outdata->dptr = (uint8_t *)ctdb;
                outdata->dsize = sizeof(*ctdb);
@@ -94,7 +110,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
 void ctdb_request_control(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
 {
        struct ctdb_req_control *c = (struct ctdb_req_control *)hdr;
-       TDB_DATA data, outdata;
+       TDB_DATA data, *outdata;
        struct ctdb_reply_control *r;
        int32_t status;
        size_t len;
@@ -102,10 +118,10 @@ void ctdb_request_control(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
        data.dptr = &c->data[0];
        data.dsize = c->datalen;
 
-       ZERO_STRUCT(outdata);
-       status = ctdb_control_dispatch(ctdb, c->opcode, data, &outdata);
+       outdata = talloc_zero(c, TDB_DATA);
+       status = ctdb_control_dispatch(ctdb, c->opcode, data, outdata);
 
-       len = offsetof(struct ctdb_reply_control, data) + outdata.dsize;
+       len = offsetof(struct ctdb_reply_control, data) + outdata->dsize;
        r = ctdb->methods->allocate_pkt(ctdb, len);
        CTDB_NO_MEMORY_VOID(ctdb, r);
        talloc_set_name_const(r, "ctdb_reply_control packet");
@@ -118,9 +134,9 @@ void ctdb_request_control(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
        r->hdr.srcnode      = ctdb->vnn;
        r->hdr.reqid        = hdr->reqid;
        r->status           = status;
-       r->datalen          = outdata.dsize;
-       if (outdata.dsize) {
-               memcpy(&r->data[0], outdata.dptr, outdata.dsize);
+       r->datalen          = outdata->dsize;
+       if (outdata->dsize) {
+               memcpy(&r->data[0], outdata->dptr, outdata->dsize);
        }
        
        ctdb_queue_packet(ctdb, &r->hdr);       

diff --git a/ctdb/include/ctdb.h b/ctdb/include/ctdb.h
index 4760cdbb517163a2251fc8b10f6192d2629079d9..3d252ef4d7495b0e18ccb21e89b26dba73e49113 100644 (file)
--- a/ctdb/include/ctdb.h
+++ b/ctdb/include/ctdb.h
@@ -215,6 +215,9 @@ struct ctdb_context *ctdb_cmdline_client(struct event_context *ev);
 struct ctdb_status;
 int ctdb_status(struct ctdb_context *ctdb, uint32_t destnode, struct ctdb_status *status);
 
+struct ctdb_vnn_map;
+int ctdb_getvnnmap(struct ctdb_context *ctdb, uint32_t destnode, struct ctdb_vnn_map *vnnmap);
+
 int ctdb_getdbpath(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx, const char **path);
 
 int ctdb_process_exists(struct ctdb_context *ctdb, uint32_t destnode, pid_t pid);

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 2176afc2524fe5f018f9c8d8847ad1a8eb1198a3..658c0436d3a833c1656a78ab83279402845a9aa5 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -243,7 +243,8 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS,
                    CTDB_CONTROL_STATUS, 
                    CTDB_CONTROL_CONFIG,
                    CTDB_CONTROL_PING,
-                   CTDB_CONTROL_GETDBPATH};
+                   CTDB_CONTROL_GETDBPATH,
+                   CTDB_CONTROL_GETVNNMAP};
 
 enum call_state {CTDB_CALL_WAIT, CTDB_CALL_DONE, CTDB_CALL_ERROR};
 

diff --git a/ctdb/tools/ctdb_control.c b/ctdb/tools/ctdb_control.c
index 9cf52aa9b1bfc32d72efdf6aded7561a40e6c5fb..378b7b6ec880b47db7faeba2edbc74201ea187dc 100644 (file)
--- a/ctdb/tools/ctdb_control.c
+++ b/ctdb/tools/ctdb_control.c
@@ -36,6 +36,7 @@ static void usage(void)
        printf("  ping\n");
        printf("  process-exists <vnn:pid>\n");
        printf("  status <vnn>\n");
+       printf("  getvnnmap <vnn>\n");
        exit(1);
 }
 
@@ -116,6 +117,30 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv
        return 0;
 }
 
+static int control_getvnnmap(struct ctdb_context *ctdb, int argc, const char **argv)
+{
+       uint32_t vnn;
+       int i, ret;
+       struct ctdb_vnn_map *vnnmap;
+       if (argc < 1) {
+               usage();
+       }
+
+       vnn = strtoul(argv[0], NULL, 0);
+
+       vnnmap = talloc_zero(ctdb, struct ctdb_vnn_map);
+       ret = ctdb_getvnnmap(ctdb, vnn, vnnmap);
+       if (ret != 0) {
+               printf("Unable to get vnnmap from node %u\n", vnn);
+               return ret;
+       }
+       printf("Generation:%d\n",vnnmap->generation);
+       printf("Size:%d\n",vnnmap->size);
+       for(i=0;i<vnnmap->size;i++){
+               printf("hash:%d lmaster:%d\n",i,vnnmap->map[i]);
+       }
+       return 0;
+}
 
 static int control_ping(struct ctdb_context *ctdb, int argc, const char **argv)
 {
@@ -190,6 +215,8 @@ int main(int argc, const char *argv[])
                ret = control_process_exists(ctdb, extra_argc-1, extra_argv+1);
        } else if (strcmp(control, "status") == 0) {
                ret = control_status(ctdb, extra_argc-1, extra_argv+1);
+       } else if (strcmp(control, "getvnnmap") == 0) {
+               ret = control_getvnnmap(ctdb, extra_argc-1, extra_argv+1);
        } else if (strcmp(control, "ping") == 0) {
                ret = control_ping(ctdb, extra_argc-1, extra_argv+1);
        } else {