diff options
| author | Dan Lambright <dlambrig@redhat.com> | 2015-11-01 10:22:00 -0500 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-11-07 13:44:38 -0800 |
| commit | 5b989f034d522ffe8c311481b7ef2064358cb06f (patch) | |
| tree | 9fd1feba9c3a71b361c66240ff13c79f17f4de88 /xlators | |
| parent | f3b555e029e6531d914fb67e098929ffe03d161b (diff) | |
cluster/tier correct promotion cycle calculation
This is a backport of 12480
The tier translator should only choose candidate files for promotion
from the most recent cycle, not a multiple of the most recent cycles.
Otherwise user observed behavior can be inconsistent. Remove related
test in tier.t that is subject to race condition.
> Change-Id: I9ad1523cac00f904097ce468efa6ddd515857024
> BUG: 1275524
> Signed-off-by: root <root@rhs-cli-15.gdev.lab.eng.bos.redhat.com>
> Signed-off-by: Dan Lambright <dlambrig@redhat.com>
> Reviewed-on: http://review.gluster.org/12480
> Reviewed-by: Joseph Fernandes
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Conflicts:
tests/basic/tier/tier.t
xlators/cluster/dht/src/tier.c
Change-Id: Ic4587bf1b5d26ba377a12a4ce8e329362988a33b
BUG: 1275483
Reviewed-on: http://review.gluster.org/12536
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/dht/src/tier.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c index 31d5e8b627e..618b82d18ee 100644 --- a/xlators/cluster/dht/src/tier.c +++ b/xlators/cluster/dht/src/tier.c @@ -31,7 +31,6 @@ static void *libhandle; static gfdb_methods_t gfdb_methods; #define DB_QUERY_RECORD_SIZE 4096 -#define PROMOTION_CYCLE_CNT 4 static int @@ -1067,7 +1066,14 @@ tier_build_migration_qfile (demotion_args_t *args, goto out; } time_in_past.tv_sec = current_time.tv_sec - time_in_past.tv_sec; - time_in_past.tv_usec = current_time.tv_usec - time_in_past.tv_usec; + + /* The migration daemon may run a varrying numberof usec after the sleep */ + /* call triggers. A file may be registered in CTR some number of usec X */ + /* after the daemon started and missed in the subsequent cycle if the */ + /* daemon starts Y usec after the period in seconds where Y>X. Normalize */ + /* away this problem by always setting usec to 0. */ + time_in_past.tv_usec = 0; + gfdb_brick_dict_info.time_stamp = &time_in_past; gfdb_brick_dict_info._gfdb_promote = is_promotion; gfdb_brick_dict_info._query_cbk_args = query_cbk_args; @@ -1482,7 +1488,7 @@ tier_start (xlator_t *this, gf_defrag_info_t *defrag) promotion_args.this = this; promotion_args.brick_list = &bricklist_cold; promotion_args.defrag = defrag; - promotion_args.freq_time = freq_promote * PROMOTION_CYCLE_CNT; + promotion_args.freq_time = freq_promote; ret_promotion = pthread_create (&promote_thread, NULL, &tier_promote, &promotion_args); |