diff options
author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-02-25 10:06:08 +1100 |
---|---|---|
committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-02-25 10:25:01 +1100 |
commit | e00ca55fa470d4f7751b2eb0ef36caf2bed9708d (patch) | |
tree | 09594a8540689c60ea0494a20510f897f6df585e | |
parent | 53b558a3bce18fbc05ca52a7b6bbcae6b6b125f1 (diff) | |
download | samba-e00ca55fa470d4f7751b2eb0ef36caf2bed9708d.tar.gz samba-e00ca55fa470d4f7751b2eb0ef36caf2bed9708d.tar.xz samba-e00ca55fa470d4f7751b2eb0ef36caf2bed9708d.zip |
Dont return error if trying to set db priority on a db that does not yet exist.
Just treat as a nop.
When the database is created later it will get its priority set properly.
(This used to be ctdb commit 05c934b10ad2690be9d75c9033a0b849bf16455d)
-rw-r--r-- | ctdb/server/ctdb_ltdb_server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c index ba2a9cb475..f2587aca36 100644 --- a/ctdb/server/ctdb_ltdb_server.c +++ b/ctdb/server/ctdb_ltdb_server.c @@ -1111,12 +1111,12 @@ int32_t ctdb_control_set_db_priority(struct ctdb_context *ctdb, TDB_DATA indata) ctdb_db = find_ctdb_db(ctdb, db_prio->db_id); if (!ctdb_db) { DEBUG(DEBUG_ERR,("Unknown db_id 0x%x in ctdb_set_db_priority\n", db_prio->db_id)); - return -1; + return 0; } if ((db_prio->priority<1) || (db_prio->priority>NUM_DB_PRIORITIES)) { DEBUG(DEBUG_ERR,("Trying to set invalid priority : %u\n", db_prio->priority)); - return -1; + return 0; } ctdb_db->priority = db_prio->priority; |