diff options
| author | Dan Lambright <dlambrig@redhat.com> | 2015-07-13 19:11:37 -0400 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-07-14 07:40:53 -0700 |
| commit | 4cc42d1777b9e063073f3ee545049d0954a16872 (patch) | |
| tree | 4109f4be8fbc58b1d6425fbfc65ecce8d86e374e /xlators/cluster/dht/src/dht-common.c | |
| parent | c6de1e9de73e5ce08bf9099f14da74c2c1946132 (diff) | |
cluster/tier: fixes for migration over ec as cold tier
This is a backport of fix 11433.
> An opendir is done in rebalance. The graph constructed when
> EC is used in tiering may have no local volumes (if
> all the hot volumes are on one node and all the others on
> another node). Previously the opendir only sent fops down
> the local subvolumes for migration. They must be sent down
> both the hot and cold subvolumes for tiering.
> When setxattr2() received a NULL subvolume; this dereferenced
> an uninitialized variable.
> When a lookup is done during creation of the destination
> file, the xattr dict is "polluted" with virtual xattrs.
> These cause subsequent xattrs in the new file to not be
> written by posix. They are required by EC.
> The inode gfid for "entry_loc" in gf_defrag_migrate_single_file()
> was not initialized. This made underlying translators
> think the gfid was 0, and failed migration.
> Change-Id: I6ccda8ca8e43485b9b354341bbfcb302496f632c
> BUG: 1236212
> Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Change-Id: I9b26725e055eecfec235c4291ee90b0e53d0ea62
BUG: 1242274
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/11652
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-common.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 41c76fc0431..4c36b3c822e 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -4381,7 +4381,9 @@ dht_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, goto err; } - if (!(conf->local_subvols_cnt) || !conf->defrag) { + if ((conf->defrag && conf->defrag->cmd == GF_DEFRAG_CMD_START_TIER) || + (conf->defrag && conf->defrag->cmd == GF_DEFRAG_CMD_START_DETACH_TIER) || + (!(conf->local_subvols_cnt) || !conf->defrag)) { local->call_cnt = conf->subvolume_cnt; for (i = 0; i < conf->subvolume_cnt; i++) { |