summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src/dht-rebalance.c
diff options
context:
space:
mode:
authorDan Lambright <dlambrig@redhat.com>2015-07-13 19:11:37 -0400
committerDan Lambright <dlambrig@redhat.com>2015-07-14 07:40:53 -0700
commit4cc42d1777b9e063073f3ee545049d0954a16872 (patch)
tree4109f4be8fbc58b1d6425fbfc65ecce8d86e374e /xlators/cluster/dht/src/dht-rebalance.c
parentc6de1e9de73e5ce08bf9099f14da74c2c1946132 (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-rebalance.c')
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 89cc3a82f0b..39c1647d364 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -1545,6 +1545,7 @@ gf_defrag_migrate_single_file (void *opaque)
struct timeval end = {0,};
double elapsed = {0,};
struct dht_container *rebal_entry = NULL;
+ inode_t *inode = NULL;
rebal_entry = (struct dht_container *)opaque;
if (!rebal_entry) {
@@ -1602,8 +1603,6 @@ gf_defrag_migrate_single_file (void *opaque)
gf_uuid_copy (entry_loc.pargfid, loc->gfid);
- entry_loc.inode->ia_type = entry->d_stat.ia_type;
-
ret = syncop_lookup (this, &entry_loc, &iatt, NULL, NULL, NULL);
if (ret) {
gf_msg (this->name, GF_LOG_ERROR, 0,
@@ -1614,6 +1613,11 @@ gf_defrag_migrate_single_file (void *opaque)
goto out;
}
+ inode = inode_link (entry_loc.inode, entry_loc.parent, entry->d_name, &iatt);
+ inode_unref (entry_loc.inode);
+ /* use the inode returned by inode_link */
+ entry_loc.inode = inode;
+
ret = syncop_setxattr (this, &entry_loc, migrate_data, 0, NULL, NULL);
if (ret < 0) {
op_errno = -ret;