diff options
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/rpc-lib/src/protocol-common.h | 1 | ||||
| -rw-r--r-- | rpc/xdr/src/cli1-xdr.h | 16 | ||||
| -rw-r--r-- | rpc/xdr/src/cli1-xdr.x | 10 | 
3 files changed, 8 insertions, 19 deletions
diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h index 6ef4cb702c3..874f46e0b70 100644 --- a/rpc/rpc-lib/src/protocol-common.h +++ b/rpc/rpc-lib/src/protocol-common.h @@ -184,6 +184,7 @@ enum glusterd_brick_procnum {          GLUSTERD_BRICK_XLATOR_HEAL,          GLUSTERD_BRICK_STATUS,          GLUSTERD_BRICK_OP, +        GLUSTERD_BRICK_XLATOR_DEFRAG,          GLUSTERD_BRICK_MAXVALUE,  }; diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h index d136ec255b8..903b6ff724f 100644 --- a/rpc/xdr/src/cli1-xdr.h +++ b/rpc/xdr/src/cli1-xdr.h @@ -47,22 +47,16 @@ enum gf_cli_defrag_type {  	GF_DEFRAG_CMD_STOP = 1 + 1,  	GF_DEFRAG_CMD_STATUS = 1 + 2,  	GF_DEFRAG_CMD_START_LAYOUT_FIX = 1 + 3, -	GF_DEFRAG_CMD_START_MIGRATE_DATA = 1 + 4, -	GF_DEFRAG_CMD_START_MIGRATE_DATA_FORCE = 1 + 5, -	GF_DEFRAG_CMD_START_FORCE = 1 + 6, +	GF_DEFRAG_CMD_START_FORCE = 1 + 4,  };  typedef enum gf_cli_defrag_type gf_cli_defrag_type;  enum gf_defrag_status_t {  	GF_DEFRAG_STATUS_NOT_STARTED = 0, -	GF_DEFRAG_STATUS_LAYOUT_FIX_STARTED = 1, -	GF_DEFRAG_STATUS_MIGRATE_DATA_STARTED = 2, -	GF_DEFRAG_STATUS_STOPPED = 3, -	GF_DEFRAG_STATUS_COMPLETE = 4, -	GF_DEFRAG_STATUS_FAILED = 5, -	GF_DEFRAG_STATUS_LAYOUT_FIX_COMPLETE = 6, -	GF_DEFRAG_STATUS_MIGRATE_DATA_COMPLETE = 7, -	GF_DEFRAG_STATUS_PAUSED = 8, +	GF_DEFRAG_STATUS_STARTED = 1, +	GF_DEFRAG_STATUS_STOPPED = 2, +	GF_DEFRAG_STATUS_COMPLETE = 3, +	GF_DEFRAG_STATUS_FAILED = 4,  };  typedef enum gf_defrag_status_t gf_defrag_status_t; diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x index 5f491c7b47e..f45712ce0c1 100644 --- a/rpc/xdr/src/cli1-xdr.x +++ b/rpc/xdr/src/cli1-xdr.x @@ -3,21 +3,15 @@          GF_DEFRAG_CMD_STOP,          GF_DEFRAG_CMD_STATUS,          GF_DEFRAG_CMD_START_LAYOUT_FIX, -        GF_DEFRAG_CMD_START_MIGRATE_DATA, -        GF_DEFRAG_CMD_START_MIGRATE_DATA_FORCE,          GF_DEFRAG_CMD_START_FORCE /* used by remove-brick data migration */  } ;   enum gf_defrag_status_t {          GF_DEFRAG_STATUS_NOT_STARTED, -        GF_DEFRAG_STATUS_LAYOUT_FIX_STARTED, -        GF_DEFRAG_STATUS_MIGRATE_DATA_STARTED, +        GF_DEFRAG_STATUS_STARTED,          GF_DEFRAG_STATUS_STOPPED,          GF_DEFRAG_STATUS_COMPLETE, -        GF_DEFRAG_STATUS_FAILED, -        GF_DEFRAG_STATUS_LAYOUT_FIX_COMPLETE, -        GF_DEFRAG_STATUS_MIGRATE_DATA_COMPLETE, -        GF_DEFRAG_STATUS_PAUSED +        GF_DEFRAG_STATUS_FAILED  } ;   enum gf1_cluster_type {  | 
