diff options
| author | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-02-02 06:37:06 -0800 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-02-04 23:53:28 -0800 |
| commit | d35e38660d8b8ea42bc41bfd6a50dc75dc05d6ad (patch) | |
| tree | 758c1c48d12e7fca7c929f44fbfeda5b3edfbd83 | |
| parent | 476abe074b63e4b348b48af9b04a3d27244d7d17 (diff) | |
Revert "afr: warn if pending xattrs missing during init()"
This reverts commit 101243860bca1bbda8a03ab76f6753ecc10799ed.
Change-Id: I042b251250515d703b5bc8bac55e0fc49f2dfc69
BUG: 1293536
Signed-off-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/13338
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
| -rw-r--r-- | xlators/cluster/afr/src/afr-messages.h | 11 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.c | 7 |
2 files changed, 1 insertions, 17 deletions
diff --git a/xlators/cluster/afr/src/afr-messages.h b/xlators/cluster/afr/src/afr-messages.h index 8217767fc4f..d07c7bc2170 100644 --- a/xlators/cluster/afr/src/afr-messages.h +++ b/xlators/cluster/afr/src/afr-messages.h @@ -45,7 +45,7 @@ */ #define GLFS_COMP_BASE_AFR GLFS_MSGID_COMP_AFR -#define GLFS_NUM_MESSAGES 40 +#define GLFS_NUM_MESSAGES 39 #define GLFS_MSGID_END (GLFS_COMP_BASE_AFR + GLFS_NUM_MESSAGES + 1) #define glfs_msg_start_x GLFS_COMP_BASE_AFR, "Invalid: Start of messages" @@ -347,14 +347,5 @@ #define AFR_MSG_REPLACE_BRICK_FAILED (GLFS_COMP_BASE_AFR + 39) -/*! - * @messageid 108039 - * @diagnosis AFR was unable to be loaded because the pending-changelog xattrs - * were not found in the volfile. - * @recommendedaction Please ensure cluster op-version is atleast 30707 and the - * volfiles are regenerated. -*/ -#define AFR_MSG_NO_CHANGELOG (GLFS_COMP_BASE_AFR + 40) - #define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" #endif /* !_AFR_MESSAGES_H_ */ diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index 34de74da977..4c072b6c69f 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -411,13 +411,6 @@ init (xlator_t *this) ret = -ENOMEM; goto out; } - if (!xattrs_list) { - ret = -EINVAL; - gf_msg (this->name, GF_LOG_ERROR, -ret, AFR_MSG_NO_CHANGELOG, - "Unable to fetch afr pending changelogs. Is op-version" - " >= 30707?"); - goto out; - } ptr = gf_strdup (xattrs_list); if (!ptr) { ret = -ENOMEM; |