summaryrefslogtreecommitdiffstats
path: root/rpc/xdr
diff options
context:
space:
mode:
authorshishirng <shishirng@gluster.com>2012-01-18 15:29:15 +0530
committerVijay Bellur <vijay@gluster.com>2012-02-19 01:31:19 -0800
commit7ba1e1ed45cee56ef51b9c04df99c976546d5d04 (patch)
treed3e4121729d51852a120ba5f067aa8a64f39b624 /rpc/xdr
parent061d70e8195d082043b071118333b7e3173fa3ec (diff)
cluster/dht: Rebalance will be a new glusterfs process
rebalance will not use any maintainance clients. It is replaced by syncops, with the volfile. Brickop (communication between glusterd<->glusterfs process) is used for status and stop commands. Dept-first traversal of dir is maintained, but data is migrated as and when encounterd. fix-layout (dir) do Complete migrate-data of dir fix-layout (subdir) done Rebalance state is saved in the vol file, for restart-ability. A disconnect event and pidfile state determine the defrag-status Signed-off-by: shishirng <shishirng@gluster.com> Change-Id: Iec6c80c84bbb2142d840242c28db3d5f5be94d01 BUG: 763844 Reviewed-on: http://review.gluster.com/2540 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'rpc/xdr')
-rw-r--r--rpc/xdr/src/cli1-xdr.h16
-rw-r--r--rpc/xdr/src/cli1-xdr.x10
2 files changed, 7 insertions, 19 deletions
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 {