git.samba.org
/
metze
/
ctdb
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7a5790d
)
tools/ctdb: allow "ctdb pfetch" only on persistent databases
author
Stefan Metzmacher
<metze@samba.org>
Tue, 14 Sep 2010 14:21:27 +0000
(16:21 +0200)
committer
Ronnie Sahlberg
<ronniesahlberg@gmail.com>
Thu, 21 Oct 2010 00:10:21 +0000
(11:10 +1100)
metze
tools/ctdb.c
patch
|
blob
|
history
diff --git
a/tools/ctdb.c
b/tools/ctdb.c
index 61a6c97cbade0d356936c5af787b8967d8ef1606..bb18c6a7a5d090fb93c3b9753b4d677bce91dae6 100644
(file)
--- a/
tools/ctdb.c
+++ b/
tools/ctdb.c
@@
-2993,6
+2993,7
@@
static int control_pfetch(struct ctdb_context *ctdb, int argc, const char **argv
struct ctdb_transaction_handle *h;
TDB_DATA key, data;
int fd, ret;
struct ctdb_transaction_handle *h;
TDB_DATA key, data;
int fd, ret;
+ bool persistent;
if (argc < 2) {
talloc_free(tmp_ctx);
if (argc < 2) {
talloc_free(tmp_ctx);
@@
-3002,13
+3003,19
@@
static int control_pfetch(struct ctdb_context *ctdb, int argc, const char **argv
db_name = argv[0];
db_name = argv[0];
- if (db_exists(ctdb, db_name,
NULL
)) {
+ if (db_exists(ctdb, db_name,
&persistent
)) {
DEBUG(DEBUG_ERR,("Database '%s' does not exist\n", db_name));
talloc_free(tmp_ctx);
return -1;
}
DEBUG(DEBUG_ERR,("Database '%s' does not exist\n", db_name));
talloc_free(tmp_ctx);
return -1;
}
- ctdb_db = ctdb_attach(ctdb, db_name, true, 0);
+ if (!persistent) {
+ DEBUG(DEBUG_ERR,("Database '%s' is not persistent\n", db_name));
+ talloc_free(tmp_ctx);
+ return -1;
+ }
+
+ ctdb_db = ctdb_attach(ctdb, db_name, persistent, 0);
if (ctdb_db == NULL) {
DEBUG(DEBUG_ERR,("Unable to attach to database '%s'\n", db_name));
if (ctdb_db == NULL) {
DEBUG(DEBUG_ERR,("Unable to attach to database '%s'\n", db_name));