summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorRavishankar N <ravishankar@redhat.com>2020-10-08 11:07:03 +0530
committerKotresh HR <khiremat@redhat.com>2020-12-30 15:55:22 +0530
commitaa29aaf1c982c95c7df9d765288c2f779ac4bfb2 (patch)
tree7bb0622c220ebc5c20c3986a803a7b64ae79b1e7 /rpc
parent5704411b5e464ab3ddfad6d224f43f58eff2f1ed (diff)
downloadglusterfs-aa29aaf1c982c95c7df9d765288c2f779ac4bfb2.tar.gz
glusterfs-aa29aaf1c982c95c7df9d765288c2f779ac4bfb2.tar.xz
glusterfs-aa29aaf1c982c95c7df9d765288c2f779ac4bfb2.zip
cli/glusterd: conscious language changes for geo-rep
Replace master and slave terminology in geo-replication with primary and secondary respectively. All instances are replaced in cli and glusterd. Changes to other parts of the code to follow in separate patches. tests/00-geo-rep/* are passing thus far. Updates: #1415 Change-Id: Ifb12b7f5ce927a4a61bda1e953c1eb0fdfc8a7c5 Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-lib/src/protocol-common.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h
index 0cb5862e9a..40ed1f2c5c 100644
--- a/rpc/rpc-lib/src/protocol-common.h
+++ b/rpc/rpc-lib/src/protocol-common.h
@@ -280,11 +280,11 @@ typedef enum {
struct gf_gsync_detailed_status_ {
char node[NAME_MAX];
- char master[NAME_MAX];
+ char primary[NAME_MAX];
char brick[PATH_MAX];
- char slave_user[NAME_MAX];
- char slave[NAME_MAX];
- char slave_node[NAME_MAX];
+ char secondary_user[NAME_MAX];
+ char secondary[NAME_MAX];
+ char secondary_node[NAME_MAX];
char worker_status[NAME_MAX];
char crawl_status[NAME_MAX];
char last_synced[NAME_MAX];
@@ -299,8 +299,8 @@ struct gf_gsync_detailed_status_ {
char checkpoint_completion_time[NAME_MAX];
char checkpoint_completion_time_utc[NAME_MAX];
char brick_host_uuid[NAME_MAX];
- char slavekey[NAME_MAX];
- char session_slave[NAME_MAX];
+ char secondarykey[NAME_MAX];
+ char session_secondary[NAME_MAX];
};
enum glusterd_mgmt_v3_procnum {