From 34a7b3435af90e1e175fde31f61755d6fabda7ef Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Fri, 1 Apr 2016 12:41:54 +0530 Subject: Revert "cluster/ec: Rebalance hangs during rename" This reverts commit 3d34c495d547866a533bc0614b14163381830095, which broke building rpms and possibly other packages as well. Change-Id: I2c10a613599e63bc0cbdb1b405cd87be9efa4a99 --- libglusterfs/src/glfs-message-id.h | 9 +- tests/bugs/disperse/bug-1304988.t | 40 -------- tests/bugs/replicate/bug-921231.t | 0 xlators/features/locks/src/common.h | 2 +- xlators/features/locks/src/entrylk.c | 4 +- xlators/features/locks/src/locks.h | 3 +- xlators/features/locks/src/pl-messages.h | 64 ------------- xlators/features/locks/src/posix.c | 154 +++++++++---------------------- 8 files changed, 51 insertions(+), 225 deletions(-) delete mode 100755 tests/bugs/disperse/bug-1304988.t mode change 100755 => 100644 tests/bugs/replicate/bug-921231.t delete mode 100644 xlators/features/locks/src/pl-messages.h diff --git a/libglusterfs/src/glfs-message-id.h b/libglusterfs/src/glfs-message-id.h index b022ca591ec..e1b75400bbd 100644 --- a/libglusterfs/src/glfs-message-id.h +++ b/libglusterfs/src/glfs-message-id.h @@ -162,13 +162,6 @@ GLFS_MSGID_COMP_SYMLINK_CACHE_END #define GLFS_MSGID_COMP_SHARD GLFS_MSGID_COMP_CHANGELOG_LIB_END #define GLFS_MSGID_COMP_SHARD_END (GLFS_MSGID_COMP_SHARD +\ GLFS_MSGID_SEGMENT) - -#define GLFS_MSGID_COMP_NSR GLFS_MSGID_COMP_SHARD_END -#define GLFS_MSGID_COMP_NSR_END (GLFS_MSGID_COMP_SHARD_END+\ - GLFS_MSGID_SEGMENT) - -#define GLFS_MSGID_COMP_PL GLFS_MSGID_COMP_NSR_END -#define GLFS_MSGID_COMP_PL_END (GLFS_MSGID_COMP_PL +\ - GLFS_MSGID_SEGMENT) +/* --- new segments for messages goes above this line --- */ #endif /* !_GLFS_MESSAGE_ID_H_ */ diff --git a/tests/bugs/disperse/bug-1304988.t b/tests/bugs/disperse/bug-1304988.t deleted file mode 100755 index 1a81dccdeae..00000000000 --- a/tests/bugs/disperse/bug-1304988.t +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. $(dirname $0)/../../include.rc -. $(dirname $0)/../../volume.rc - -# This test renames files from dir to test and vice versa in an infinite loop -# at the same time add-brick and rebalance starts which should NOT be hanged - -cleanup; - -function rename_files { -while : -do - for i in {1..100}; do mv $M0/dir/file-$i $M0/test/newfile-$i; done - for i in {1..100}; do mv $M0/test/newfile-$i $M0/dir/file-$i; done -done -} - -TEST glusterd -TEST pidof glusterd -TEST $CLI volume create $V0 disperse 6 redundancy 2 $H0:$B0/${V0}{0..5} -TEST $CLI volume start $V0 -TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0 -EXPECT_WITHIN $CHILD_UP_TIMEOUT "6" ec_child_up_count $V0 0 - -mkdir $M0/dir -mkdir $M0/test -touch $M0/dir/file-{1..100} -rename_files & -back_pid1=$!; -echo "Started rename $back_pid1" - -TEST $CLI volume add-brick $V0 $H0:$B0/${V0}{6..11} -TEST $CLI volume rebalance $V0 start force - -#Test if rebalance completed with success. -EXPECT_WITHIN $REBALANCE_TIMEOUT "completed" rebalance_status_field $V0 -echo "rebalance done..." -kill $back_pid1 -cleanup; diff --git a/tests/bugs/replicate/bug-921231.t b/tests/bugs/replicate/bug-921231.t old mode 100755 new mode 100644 diff --git a/xlators/features/locks/src/common.h b/xlators/features/locks/src/common.h index 3a5cf014894..5ec630ee857 100644 --- a/xlators/features/locks/src/common.h +++ b/xlators/features/locks/src/common.h @@ -149,7 +149,7 @@ pl_verify_reservelk (xlator_t *this, pl_inode_t *pl_inode, int pl_reserve_unlock (xlator_t *this, pl_inode_t *pl_inode, posix_lock_t *reqlock); -int32_t +uint32_t check_entrylk_on_basename (xlator_t *this, inode_t *parent, char *basename); void __pl_inodelk_unref (pl_inode_lock_t *lock); diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index d039db6d5a4..a4b5969a189 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -437,10 +437,10 @@ __unlock_entrylk (pl_dom_list_t *dom, pl_entry_lock_t *lock) return ret_lock; } -int32_t +uint32_t check_entrylk_on_basename (xlator_t *this, inode_t *parent, char *basename) { - int32_t entrylk = 0; + uint32_t entrylk = 0; pl_inode_t *pinode = 0; pl_dom_list_t *dom = NULL; pl_entry_lock_t *conf = NULL; diff --git a/xlators/features/locks/src/locks.h b/xlators/features/locks/src/locks.h index ee684d5f8b5..b72cbe0a67b 100644 --- a/xlators/features/locks/src/locks.h +++ b/xlators/features/locks/src/locks.h @@ -169,7 +169,8 @@ typedef struct { data_t *inodelk_dom_count_req; dict_t *xdata; - loc_t loc[2]; + /* used by {f,}truncate */ + loc_t loc; fd_t *fd; off_t offset; enum {TRUNCATE, FTRUNCATE} op; diff --git a/xlators/features/locks/src/pl-messages.h b/xlators/features/locks/src/pl-messages.h deleted file mode 100644 index 45c8873ecb4..00000000000 --- a/xlators/features/locks/src/pl-messages.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - Copyright (c) 2016 Red Hat, Inc. - This file is part of GlusterFS. - - This file is licensed to you under your choice of the GNU Lesser - General Public License, version 3 or any later version (LGPLv3 or - later), or the GNU General Public License, version 2 (GPLv2), in all - cases as published by the Free Software Foundation. -*/ - -#ifndef _PL_MESSAGES_H_ -#define _PL_MESSAGES_H_ - -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - -#include "glfs-message-id.h" - -/*! \file pl-messages.h - * \brief Locks log-message IDs and their descriptions - */ - -/* NOTE: Rules for message additions - * 1) Each instance of a message is _better_ left with a unique message ID, even - * if the message format is the same. Reasoning is that, if the message - * format needs to change in one instance, the other instances are not - * impacted or the new change does not change the ID of the instance being - * modified. - * 2) Addition of a message, - * - Should increment the GLFS_NUM_MESSAGES - * - Append to the list of messages defined, towards the end - * - Retain macro naming as glfs_msg_X (for redability across developers) - * NOTE: Rules for message format modifications - * 3) Check acorss the code if the message ID macro in question is reused - * anywhere. If reused then then the modifications should ensure correctness - * everywhere, or needs a new message ID as (1) above was not adhered to. If - * not used anywhere, proceed with the required modification. - * NOTE: Rules for message deletion - * 4) Check (3) and if used anywhere else, then cannot be deleted. If not used - * anywhere, then can be deleted, but will leave a hole by design, as - * addition rules specify modification to the end of the list and not filling - * holes. - */ - -#define GLFS_PL_COMP_BASE GLFS_MSGID_COMP_PL -#define GLFS_NUM_MESSAGES 1 -#define GLFS_MSGID_END (GLFS_PL_COMP_BASE + GLFS_NUM_MESSAGES + 1) -/* Messaged with message IDs */ -#define glfs_msg_start_x GLFS_PL_COMP_BASE, "Invalid: Start of messages" -/*------------*/ - -/*! - * @messageid - * @diagnosis - * @recommendedaction - */ -#define PL_MSG_LOCK_NUMBER (GLFS_PL_COMP_BASE + 1) - -/*------------*/ -#define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" - -#endif /* !_PL_MESSAGES_H_ */ diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index afe402cd828..76c7c4ee7ce 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -30,7 +30,6 @@ #include "clear.h" #include "defaults.h" #include "syncop.h" -#include "pl-messages.h" #ifndef LLONG_MAX #define LLONG_MAX LONG_LONG_MAX /* compat with old gcc */ @@ -52,7 +51,7 @@ static int fetch_pathinfo(xlator_t *, inode_t *, int32_t *, char **); inode_t *__inode = NULL; \ char *__name = NULL; \ dict_t *__unref = NULL; \ - int __i = 0 ; \ + \ __local = frame->local; \ if (op_ret >= 0 && pl_needs_xdata_response (frame->local)) {\ if (xdata) \ @@ -61,17 +60,12 @@ static int fetch_pathinfo(xlator_t *, inode_t *, int32_t *, char **); xdata = dict_new(); \ if (xdata) { \ __unref = xdata; \ - while (__local->fd || __local->loc[__i].inode) { \ - pl_get_xdata_rsp_args (__local, \ - #fop, &__parent, &__inode, \ - &__name, __i); \ - pl_set_xdata_response (frame->this, \ - __local, __parent, __inode, __name, \ - xdata, __i > 0); \ - if (__local->fd || __i == 1) \ - break; \ - __i++; \ - } \ + pl_get_xdata_rsp_args (__local, \ + #fop, &__parent, &__inode, \ + &__name); \ + pl_set_xdata_response (frame->this, \ + __local, __parent, __inode, __name, \ + xdata); \ } \ } \ frame->local = NULL; \ @@ -79,8 +73,7 @@ static int fetch_pathinfo(xlator_t *, inode_t *, int32_t *, char **); if (__local) { \ if (__local->inodelk_dom_count_req) \ data_unref (__local->inodelk_dom_count_req);\ - loc_wipe (&__local->loc[0]); \ - loc_wipe (&__local->loc[1]); \ + loc_wipe (&__local->loc); \ if (__local->fd) \ fd_unref (__local->fd); \ mem_put (__local); \ @@ -89,22 +82,16 @@ static int fetch_pathinfo(xlator_t *, inode_t *, int32_t *, char **); dict_unref (__unref); \ } while (0) -#define PL_LOCAL_GET_REQUESTS(frame, this, xdata, __fd, __loc, __newloc)\ +#define PL_LOCAL_GET_REQUESTS(frame, this, xdata, __fd, __loc) \ do { \ if (pl_has_xdata_requests (xdata)) { \ frame->local = mem_get0 (this->local_pool); \ pl_local_t *__local = frame->local; \ if (__local) { \ - if (__fd) { \ + if (__fd) \ __local->fd = fd_ref (__fd); \ - } else { \ - if (__loc) \ - loc_copy (&__local->loc[0],\ - __loc); \ - if (__newloc) \ - loc_copy (&__local->loc[1],\ - __newloc); \ - } \ + else \ + loc_copy (&__local->loc, __loc);\ pl_get_xdata_requests (__local, xdata); \ } \ } \ @@ -185,17 +172,17 @@ pl_needs_xdata_response (pl_local_t *local) void pl_get_xdata_rsp_args (pl_local_t *local, char *fop, inode_t **parent, - inode_t **inode, char **name, int i) + inode_t **inode, char **name) { if (strcmp (fop, "lookup") == 0) { - *parent = local->loc[0].parent; - *inode = local->loc[0].inode; - *name = (char *)local->loc[0].name; + *parent = local->loc.parent; + *inode = local->loc.inode; + *name = (char *)local->loc.name; } else { if (local->fd) { *inode = local->fd->inode; } else { - *inode = local->loc[i].parent; + *inode = local->loc.parent; } } } @@ -241,22 +228,16 @@ out: void pl_parent_entrylk_xattr_fill (xlator_t *this, inode_t *parent, - char *basename, dict_t *dict, gf_boolean_t keep_max) + char *basename, dict_t *dict) { - int32_t entrylk = 0; - int32_t maxcount = -1; - int ret = -1; + uint32_t entrylk = 0; + int ret = -1; if (!parent || !basename || !strlen (basename)) goto out; - if (keep_max) { - ret = dict_get_int32 (dict, GLUSTERFS_PARENT_ENTRYLK, &maxcount); - } entrylk = check_entrylk_on_basename (this, parent, basename); - if (maxcount >= entrylk) - return; out: - ret = dict_set_int32 (dict, GLUSTERFS_PARENT_ENTRYLK, entrylk); + ret = dict_set_uint32 (dict, GLUSTERFS_PARENT_ENTRYLK, entrylk); if (ret < 0) { gf_log (this->name, GF_LOG_DEBUG, " dict_set failed on key %s", GLUSTERFS_PARENT_ENTRYLK); @@ -265,19 +246,12 @@ out: void pl_entrylk_xattr_fill (xlator_t *this, inode_t *inode, - dict_t *dict, gf_boolean_t keep_max) + dict_t *dict) { int32_t count = 0; - int32_t maxcount = -1; int ret = -1; - if (keep_max) { - ret = dict_get_int32 (dict, GLUSTERFS_ENTRYLK_COUNT, &maxcount); - } count = get_entrylk_count (this, inode); - if (maxcount >= count) - return; - ret = dict_set_int32 (dict, GLUSTERFS_ENTRYLK_COUNT, count); if (ret < 0) { gf_log (this->name, GF_LOG_DEBUG, @@ -288,18 +262,13 @@ pl_entrylk_xattr_fill (xlator_t *this, inode_t *inode, void pl_inodelk_xattr_fill (xlator_t *this, inode_t *inode, dict_t *dict, - char *domname, gf_boolean_t keep_max) + char *domname) { int32_t count = 0; - int32_t maxcount = -1; int ret = -1; - if (keep_max) { - ret = dict_get_int32 (dict, GLUSTERFS_INODELK_COUNT, &maxcount); - } + count = get_inodelk_count (this, inode, domname); - if (maxcount >= count) - return; ret = dict_set_int32 (dict, GLUSTERFS_INODELK_COUNT, count); if (ret < 0) { @@ -312,19 +281,12 @@ pl_inodelk_xattr_fill (xlator_t *this, inode_t *inode, dict_t *dict, void pl_posixlk_xattr_fill (xlator_t *this, inode_t *inode, - dict_t *dict, gf_boolean_t keep_max) + dict_t *dict) { int32_t count = 0; - int32_t maxcount = -1; int ret = -1; - if (keep_max) { - ret = dict_get_int32 (dict, GLUSTERFS_POSIXLK_COUNT, &maxcount); - } count = get_posixlk_count (this, inode); - if (maxcount >= count) - return; - ret = dict_set_int32 (dict, GLUSTERFS_POSIXLK_COUNT, count); if (ret < 0) { gf_log (this->name, GF_LOG_DEBUG, @@ -335,26 +297,26 @@ pl_posixlk_xattr_fill (xlator_t *this, inode_t *inode, void pl_set_xdata_response (xlator_t *this, pl_local_t *local, inode_t *parent, - inode_t *inode, char *name, dict_t *xdata, gf_boolean_t max_lock) + inode_t *inode, char *name, dict_t *xdata) { if (!xdata || !local) return; if (local->parent_entrylk_req && parent && name && strlen (name)) - pl_parent_entrylk_xattr_fill (this, parent, name, xdata, max_lock); + pl_parent_entrylk_xattr_fill (this, parent, name, xdata); if (local->entrylk_count_req && inode) - pl_entrylk_xattr_fill (this, inode, xdata, max_lock); + pl_entrylk_xattr_fill (this, inode, xdata); if (local->inodelk_dom_count_req && inode) pl_inodelk_xattr_fill (this, inode, xdata, - data_to_str (local->inodelk_dom_count_req), max_lock); + data_to_str (local->inodelk_dom_count_req)); if (local->inodelk_count_req && inode) - pl_inodelk_xattr_fill (this, inode, xdata, NULL, max_lock); + pl_inodelk_xattr_fill (this, inode, xdata, NULL); if (local->posixlk_count_req && inode) - pl_posixlk_xattr_fill (this, inode, xdata, max_lock); + pl_posixlk_xattr_fill (this, inode, xdata); } static pl_fdctx_t * @@ -417,7 +379,7 @@ pl_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, local = frame->local; if (local->op == TRUNCATE) - loc_wipe (&local->loc[0]); + loc_wipe (&local->loc); if (local->xdata) dict_unref (local->xdata); @@ -486,7 +448,7 @@ truncate_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } if (local->op == TRUNCATE) - inode = local->loc[0].inode; + inode = local->loc.inode; else inode = local->fd->inode; @@ -511,7 +473,7 @@ truncate_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, case TRUNCATE: STACK_WIND (frame, pl_truncate_cbk, FIRST_CHILD (this), FIRST_CHILD (this)->fops->truncate, - &local->loc[0], local->offset, local->xdata); + &local->loc, local->offset, local->xdata); break; case FTRUNCATE: STACK_WIND (frame, pl_truncate_cbk, FIRST_CHILD (this), @@ -526,7 +488,7 @@ unwind: gf_log (this->name, GF_LOG_ERROR, "truncate failed with ret: %d, " "error: %s", op_ret, strerror (op_errno)); if (local->op == TRUNCATE) - loc_wipe (&local->loc[0]); + loc_wipe (&local->loc); if (local->xdata) dict_unref (local->xdata); if (local->fd) @@ -548,7 +510,7 @@ pl_truncate (call_frame_t *frame, xlator_t *this, local->op = TRUNCATE; local->offset = offset; - loc_copy (&local->loc[0], loc); + loc_copy (&local->loc, loc); if (xdata) local->xdata = dict_ref (xdata); @@ -1243,7 +1205,7 @@ int32_t pl_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, dict_t *xdata) { - PL_LOCAL_GET_REQUESTS (frame, this, xdata, fd, NULL, NULL); + PL_LOCAL_GET_REQUESTS (frame, this, xdata, fd, NULL); STACK_WIND (frame, pl_opendir_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->opendir, loc, fd, xdata); return 0; @@ -1369,7 +1331,7 @@ pl_create (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, mode_t mode, mode_t umask, fd_t *fd, dict_t *xdata) { - PL_LOCAL_GET_REQUESTS (frame, this, xdata, NULL, loc, NULL); + PL_LOCAL_GET_REQUESTS (frame, this, xdata, NULL, loc); STACK_WIND (frame, pl_create_cbk, FIRST_CHILD (this), FIRST_CHILD (this)->fops->create, loc, flags, mode, umask, fd, xdata); @@ -1390,7 +1352,7 @@ int32_t pl_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc, int xflag, dict_t *xdata) { - PL_LOCAL_GET_REQUESTS (frame, this, xdata, NULL, loc, NULL); + PL_LOCAL_GET_REQUESTS (frame, this, xdata, NULL, loc); STACK_WIND (frame, pl_unlink_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->unlink, loc, xflag, xdata); return 0; @@ -1498,7 +1460,7 @@ pl_readv (call_frame_t *frame, xlator_t *this, priv = this->private; pl_inode = pl_inode_get (this, fd->inode); - PL_LOCAL_GET_REQUESTS (frame, this, xdata, fd, NULL, NULL); + PL_LOCAL_GET_REQUESTS (frame, this, xdata, fd, NULL); if (priv->mandatory && pl_inode->mandatory) { region.fl_start = offset; @@ -1594,7 +1556,7 @@ pl_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, priv = this->private; pl_inode = pl_inode_get (this, fd->inode); - PL_LOCAL_GET_REQUESTS (frame, this, xdata, fd, NULL, NULL); + PL_LOCAL_GET_REQUESTS (frame, this, xdata, fd, NULL); if (priv->mandatory && pl_inode->mandatory) { region.fl_start = offset; @@ -2221,7 +2183,7 @@ pl_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t pl_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) { - PL_LOCAL_GET_REQUESTS (frame, this, xdata, NULL, loc, NULL); + PL_LOCAL_GET_REQUESTS (frame, this, xdata, NULL, loc); STACK_WIND (frame, pl_lookup_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->lookup, loc, xdata); return 0; @@ -2238,7 +2200,7 @@ pl_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t pl_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) { - PL_LOCAL_GET_REQUESTS (frame, this, xdata, fd, NULL, NULL); + PL_LOCAL_GET_REQUESTS (frame, this, xdata, fd, NULL); STACK_WIND (frame, pl_fstat_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->fstat, fd, xdata); return 0; @@ -2261,7 +2223,7 @@ pl_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, list_for_each_entry (entry, &entries->list, list) { pl_set_xdata_response (this, local, local->fd->inode, entry->inode, entry->d_name, - entry->dict, 0); + entry->dict); } unwind: @@ -2275,7 +2237,7 @@ int pl_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, off_t offset, dict_t *xdata) { - PL_LOCAL_GET_REQUESTS (frame, this, xdata, fd, NULL, NULL); + PL_LOCAL_GET_REQUESTS (frame, this, xdata, fd, NULL); STACK_WIND (frame, pl_readdirp_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->readdirp, fd, size, offset, xdata); @@ -2828,31 +2790,6 @@ pl_fentrylk (call_frame_t *frame, xlator_t *this, const char *volume, fd_t *fd, const char *basename, entrylk_cmd cmd, entrylk_type type, dict_t *xdata); -int32_t -pl_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct iatt *buf, - struct iatt *preoldparent, struct iatt *postoldparent, - struct iatt *prenewparent, struct iatt *postnewparent, - dict_t *xdata) -{ - PL_STACK_UNWIND (rename, xdata, frame, op_ret, op_errno, - buf, preoldparent, postoldparent, prenewparent, - postnewparent, xdata); - return 0; -} - -int32_t -pl_rename (call_frame_t *frame, xlator_t *this, - loc_t *oldloc, loc_t *newloc, dict_t *xdata) -{ - PL_LOCAL_GET_REQUESTS (frame, this, xdata, NULL, oldloc, newloc); - - STACK_WIND (frame, pl_rename_cbk, FIRST_CHILD (this), - FIRST_CHILD(this)->fops->rename, oldloc, - newloc, xdata); - return 0; -} - struct xlator_fops fops = { .lookup = pl_lookup, .create = pl_create, @@ -2873,7 +2810,6 @@ struct xlator_fops fops = { .getxattr = pl_getxattr, .fgetxattr = pl_fgetxattr, .fsetxattr = pl_fsetxattr, - .rename = pl_rename, }; struct xlator_dumpops dumpops = { -- cgit