------------------------------------------------------------
revno: 326
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Sat 2007-05-19 14:07:01 +1000
message:
removed obsolete ctdb_dump tool
removed:
tools/ctdb_dump.c ctdb_dump.c-20070422072106-vavpof4y9zz8z2lh-1
modified:
Makefile.in makefile.in-20061117234101-o3qt14umlg9en8z0-1
=== removed file 'tools/ctdb_dump.c'
--- a/tools/ctdb_dump.c 2007-04-22 14:53:09 +0000
+++ b/tools/ctdb_dump.c 1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-/*
- ctdb status tool
-
- Copyright (C) Andrew Tridgell 2007
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "includes.h"
-#include "lib/events/events.h"
-#include "system/filesys.h"
-#include "popt.h"
-#include "cmdline.h"
-#include "../include/ctdb_private.h"
-#include "db_wrap.h"
-
-
-/*
- show usage message
- */
-static void usage(void)
-{
- printf("Usage: ctdb_dump <path>\n");
- exit(1);
-}
-
-struct node_info {
- uint32_t num_nodes;
- uint32_t vnn;
-};
-
-static int traverse_fn(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
void *p)
-{
- struct node_info *info = (struct node_info *)p;
- struct id {
- dev_t dev;
- ino_t inode;
- } *id;
- struct ctdb_ltdb_header *h = (struct ctdb_ltdb_header *)data.dptr;
- char *keystr;
- uint32_t lmaster;
- int authoritative=0;
-
- lmaster = ctdb_hash(&key) % info->num_nodes;
-
- id = (struct id *)key.dptr;
- if (key.dsize == sizeof(*id)) {
- keystr = talloc_asprintf(NULL, "%llu:%llu",
- (uint64_t)id->dev,
(uint64_t)id->inode);
- } else {
- keystr = hex_encode(NULL, key.dptr, key.dsize);
- }
- authoritative = (info->vnn == lmaster || info->vnn == h->dmaster);
- printf(" rec %s lmaster=%u dmaster=%u %c\n",
- keystr,
- lmaster,
- h->dmaster,
- authoritative?'A':' ');
- talloc_free(keystr);
- return 0;
-}
-
-/*
- main program
-*/
-int main(int argc, const char *argv[])
-{
- struct poptOption popt_options[] = {
- POPT_AUTOHELP
- POPT_CTDB_CMDLINE
- POPT_TABLEEND
- };
- int opt;
- const char **extra_argv;
- int i, extra_argc = 0;
- poptContext pc;
- struct tdb_wrap *db;
- struct node_info info;
-
- pc = poptGetContext(argv[0], argc, argv, popt_options,
POPT_CONTEXT_KEEP_FIRST);
-
- while ((opt = poptGetNextOpt(pc)) != -1) {
- switch (opt) {
- default:
- fprintf(stderr, "Invalid option %s: %s\n",
- poptBadOption(pc, 0), poptStrerror(opt));
- exit(1);
- }
- }
-
- /* setup the remaining options for the main program to use */
- extra_argv = poptGetArgs(pc);
- if (extra_argv) {
- extra_argv++;
- while (extra_argv[extra_argc]) extra_argc++;
- }
-
- if (extra_argc < 1) {
- usage();
- }
-
- for (i=0;i<extra_argc;i++) {
- db = tdb_wrap_open(NULL, extra_argv[i], 0, TDB_DEFAULT,
O_RDONLY, 0);
- if (db == NULL) {
- printf("Failed to open %s - %s\n",
- extra_argv[i], strerror(errno));
- exit(1);
- }
-
- printf("db %s\n", extra_argv[i]);
- info.vnn = i;
- info.num_nodes = extra_argc;
- tdb_traverse(db->tdb, traverse_fn, &info);
-
- talloc_free(db);
- }
-
- return 0;
-}
=== modified file 'Makefile.in'
--- a/Makefile.in 2007-05-18 09:19:35 +0000
+++ b/Makefile.in 2007-05-19 04:07:01 +0000
@@ -38,7 +38,7 @@
OBJS = @TDB_OBJ@ @TALLOC_OBJ@ @LIBREPLACEOBJ@ @INFINIBAND_WRAPPER_OBJ@
$(EXTRA_OBJ) @EVENTS_OBJ@ $(CTDB_OBJ) $(UTIL_OBJ)
-BINS = bin/ctdbd bin/ctdbd_test bin/ctdb_test bin/ctdb_bench
bin/ctdb_messaging bin/ctdb_fetch bin/ctdb_fetch1 bin/lockwait bin/ctdb_control
bin/ctdb_dump @INFINIBAND_BINS@
+BINS = bin/ctdbd bin/ctdbd_test bin/ctdb_test bin/ctdb_bench
bin/ctdb_messaging bin/ctdb_fetch bin/ctdb_fetch1 bin/lockwait bin/ctdb_control
@INFINIBAND_BINS@
DIRS = lib bin
@@ -69,10 +69,6 @@
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ tools/ctdb_control.o $(OBJS) $(LIB_FLAGS)
-bin/ctdb_dump: $(OBJS) tools/ctdb_dump.o
- @echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tools/ctdb_dump.o $(OBJS) $(LIB_FLAGS)
-
bin/ctdbd_test: $(OBJS) direct/ctdbd_test.o
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ direct/ctdbd_test.o
