diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-09-12 09:34:34 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-09-12 09:34:34 +1000 |
| commit | 0dc5584101e61eeadf908d3340c2ef2fecd4cc22 (patch) | |
| tree | fbd9296e38e71309d80c9ddf9abcc58aae9d9c4e /ctdb/include/ctdb_protocol.h | |
| parent | d78b0ff985c7a389ab4678fef4c2cc30cd278f42 (diff) | |
| parent | 01388c4414fcd976581f661cbe764fa0f984b293 (diff) | |
| download | samba-0dc5584101e61eeadf908d3340c2ef2fecd4cc22.tar.gz samba-0dc5584101e61eeadf908d3340c2ef2fecd4cc22.tar.xz samba-0dc5584101e61eeadf908d3340c2ef2fecd4cc22.zip | |
Merge branch 'master-readonly-records' into foo
Conflicts:
Makefile.in
tools/ctdb.c
(This used to be ctdb commit 0fedef0ffba4178126eee9544c5e2db52f5db893)
Diffstat (limited to 'ctdb/include/ctdb_protocol.h')
| -rw-r--r-- | ctdb/include/ctdb_protocol.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 0422afeb7b..f4019ab172 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -30,8 +30,9 @@ #define CTDB_DS_ALIGNMENT 8 -#define CTDB_NULL_FUNC 0xFF000001 -#define CTDB_FETCH_FUNC 0xFF000002 +#define CTDB_NULL_FUNC 0xFF000001 +#define CTDB_FETCH_FUNC 0xFF000002 +#define CTDB_FETCH_WITH_HEADER_FUNC 0xFF000003 struct ctdb_call { @@ -40,8 +41,9 @@ struct ctdb_call { TDB_DATA call_data; TDB_DATA reply_data; uint32_t status; -#define CTDB_IMMEDIATE_MIGRATION 0x00000001 +#define CTDB_IMMEDIATE_MIGRATION 0x00000001 #define CTDB_CALL_FLAG_VACUUM_MIGRATION 0x00000002 +#define CTDB_WANT_READONLY 0x00000004 uint32_t flags; }; @@ -50,6 +52,7 @@ struct ctdb_call { */ struct ctdb_call_info { TDB_DATA key; /* record key */ + struct ctdb_ltdb_header *header; TDB_DATA record_data; /* current data in the record */ TDB_DATA *new_data; /* optionally updated record data */ TDB_DATA *call_data; /* optionally passed from caller */ @@ -363,6 +366,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS = 0, CTDB_CONTROL_TCP_ADD_DELAYED_UPDATE = 126, CTDB_CONTROL_GET_STAT_HISTORY = 127, CTDB_CONTROL_SCHEDULE_FOR_DELETION = 128, + CTDB_CONTROL_SET_DB_READONLY = 129, }; /* @@ -486,6 +490,10 @@ struct ctdb_ltdb_header { #define CTDB_REC_FLAG_MIGRATED_WITH_DATA 0x00010000 #define CTDB_REC_FLAG_VACUUM_MIGRATED 0x00020000 #define CTDB_REC_FLAG_AUTOMATIC 0x00040000 +#define CTDB_REC_RO_HAVE_DELEGATIONS 0x01000000 +#define CTDB_REC_RO_HAVE_READONLY 0x02000000 +#define CTDB_REC_RO_REVOKING_READONLY 0x04000000 +#define CTDB_REC_RO_REVOKE_COMPLETE 0x08000000 uint32_t flags; }; |