diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2013-09-12 16:27:39 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-10-04 15:20:25 +1000 |
| commit | 91d644325dbf0c4ceeff2dfee38534c0667e1529 (patch) | |
| tree | c975531bcca19fec449044a6ac903e0e66dc8909 | |
| parent | 1ff964586565632496b10ebf3ca45c10f4afa44b (diff) | |
ctdbd: Deprecate TRANS2 commit controls
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 7d176352986317e63696d74252ff5d8eccb2fee5)
| -rw-r--r-- | ctdb/include/ctdb_protocol.h | 12 | ||||
| -rw-r--r-- | ctdb/server/ctdb_control.c | 11 |
2 files changed, 11 insertions, 12 deletions
diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 73ce0e1691..01c3d8984e 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -332,7 +332,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS = 0, CTDB_CONTROL_CHECK_SERVER_ID = 59, CTDB_CONTROL_GET_SERVER_ID_LIST = 60, CTDB_CONTROL_DB_ATTACH_PERSISTENT = 61, - CTDB_CONTROL_PERSISTENT_STORE = 62, + CTDB_CONTROL_PERSISTENT_STORE = 62, /* obsolete */ CTDB_CONTROL_UPDATE_RECORD = 63, CTDB_CONTROL_SEND_GRATIOUS_ARP = 64, CTDB_CONTROL_TRANSACTION_START = 65, @@ -353,10 +353,10 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS = 0, CTDB_CONTROL_GET_CAPABILITIES = 80, CTDB_CONTROL_START_PERSISTENT_UPDATE = 81, CTDB_CONTROL_CANCEL_PERSISTENT_UPDATE= 82, - CTDB_CONTROL_TRANS2_COMMIT = 83, - CTDB_CONTROL_TRANS2_FINISHED = 84, - CTDB_CONTROL_TRANS2_ERROR = 85, - CTDB_CONTROL_TRANS2_COMMIT_RETRY = 86, + CTDB_CONTROL_TRANS2_COMMIT = 83, /* obsolete */ + CTDB_CONTROL_TRANS2_FINISHED = 84, /* obsolete */ + CTDB_CONTROL_TRANS2_ERROR = 85, /* obsolete */ + CTDB_CONTROL_TRANS2_COMMIT_RETRY = 86, /* obsolete */ CTDB_CONTROL_RECD_PING = 87, CTDB_CONTROL_RELEASE_IP = 88, CTDB_CONTROL_TAKEOVER_IP = 89, @@ -381,7 +381,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS = 0, CTDB_CONTROL_TRANSACTION_CANCEL = 113, CTDB_CONTROL_REGISTER_NOTIFY = 114, CTDB_CONTROL_DEREGISTER_NOTIFY = 115, - CTDB_CONTROL_TRANS2_ACTIVE = 116, + CTDB_CONTROL_TRANS2_ACTIVE = 116, /* obsolete */ CTDB_CONTROL_GET_LOG = 117, CTDB_CONTROL_CLEAR_LOG = 118, CTDB_CONTROL_TRANS3_COMMIT = 119, diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c index 4885e5f7be..99319ac523 100644 --- a/ctdb/server/ctdb_control.c +++ b/ctdb/server/ctdb_control.c @@ -439,7 +439,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb, return ctdb_control_get_server_id_list(ctdb, outdata); case CTDB_CONTROL_PERSISTENT_STORE: - return ctdb_control_persistent_store(ctdb, c, indata, async_reply); + return control_not_implemented("PERSISTENT_STORE", NULL); case CTDB_CONTROL_UPDATE_RECORD: return ctdb_control_update_record(ctdb, c, indata, async_reply); @@ -488,17 +488,16 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb, case CTDB_CONTROL_TRANS2_COMMIT: case CTDB_CONTROL_TRANS2_COMMIT_RETRY: - return ctdb_control_trans2_commit(ctdb, c, indata, async_reply); + return control_not_implemented("TRANS2_COMMIT", "TRANS3_COMMIT"); case CTDB_CONTROL_TRANS2_ERROR: - return ctdb_control_trans2_error(ctdb, c); + return control_not_implemented("TRANS2_ERROR", NULL); case CTDB_CONTROL_TRANS2_FINISHED: - return ctdb_control_trans2_finished(ctdb, c); + return control_not_implemented("TRANS2_FINISHED", NULL); case CTDB_CONTROL_TRANS2_ACTIVE: - CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t)); - return ctdb_control_trans2_active(ctdb, c, *(uint32_t *)indata.dptr); + return control_not_implemented("TRANS2_ACTIVE", NULL); case CTDB_CONTROL_TRANS3_COMMIT: return ctdb_control_trans3_commit(ctdb, c, indata, async_reply); |