diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2016-12-19 13:52:59 +0530 |
|---|---|---|
| committer | Aravinda VK <avishwan@redhat.com> | 2017-02-03 01:25:56 -0500 |
| commit | a583e14056ba0358ed4e3689d19dbf59089086fe (patch) | |
| tree | 0593756bde543877442de2db1783c3f71635a283 /xlators/mgmt/glusterd/src/glusterd-messages.h | |
| parent | 4017f2415f128d91256004fbfbbd7bfe376cf241 (diff) | |
snapshot: Fix restore rollback to reassign snap volume ids to bricks
Added further checks to ensure we do not go beyond prevalidate
when trying to restore a snapshot which has a nfs-gansha conf
file, in a cluster when nfs-ganesha is not enabled
The error message for the particular scenario is:
"Snapshot(<snapname>) has a nfs-ganesha export conf
file. cluster.enable-shared-storage and nfs-ganesha
should be enabled before restoring this snapshot."
> Reviewed-on: http://review.gluster.org/16116
> Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Change-Id: I1b87e9907e0a5e162f26ef1ca89fe76e8da8610f
BUG: 1405909
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: https://review.gluster.org/16195
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Aravinda VK <avishwan@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-messages.h')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-messages.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-messages.h b/xlators/mgmt/glusterd/src/glusterd-messages.h index e520c69add2..0e15bd77621 100644 --- a/xlators/mgmt/glusterd/src/glusterd-messages.h +++ b/xlators/mgmt/glusterd/src/glusterd-messages.h @@ -41,7 +41,7 @@ #define GLUSTERD_COMP_BASE GLFS_MSGID_GLUSTERD -#define GLFS_NUM_MESSAGES 587 +#define GLFS_NUM_MESSAGES 589 #define GLFS_MSGID_END (GLUSTERD_COMP_BASE + GLFS_NUM_MESSAGES + 1) /* Messaged with message IDs */ @@ -4727,7 +4727,7 @@ * @recommendation * */ -#define GD_MSG_BRICK_CLEANUP_SUCCESS (GLUSTERD_COMP_BASE + 584) +#define GD_MSG_BRICK_CLEANUP_SUCCESS (GLUSTERD_COMP_BASE + 585) /*! * @messageid @@ -4735,7 +4735,7 @@ * @recommendation * */ -#define GD_MSG_STATE_STR_GET_FAILED (GLUSTERD_COMP_BASE + 585) +#define GD_MSG_STATE_STR_GET_FAILED (GLUSTERD_COMP_BASE + 586) /*! * @messageid @@ -4743,7 +4743,7 @@ * @recommendedaction * */ -#define GD_MSG_RESET_BRICK_COMMIT_FORCE_REQ_RCVD (GLUSTERD_COMP_BASE + 586) +#define GD_MSG_RESET_BRICK_COMMIT_FORCE_REQ_RCVD (GLUSTERD_COMP_BASE + 587) /*! * @messageid @@ -4751,7 +4751,16 @@ * @recommendedaction * */ -#define GD_MSG_RESET_BRICK_CMD_FAIL (GLUSTERD_COMP_BASE + 587) +#define GD_MSG_RESET_BRICK_CMD_FAIL (GLUSTERD_COMP_BASE + 588) + +/*! + * @messageid + * @diagnosis + * @recommendedaction + * + */ +#define GD_MSG_NFS_GANESHA_DISABLED (GLUSTERD_COMP_BASE + 589) + /*------------*/ #define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" #endif /* !_GLUSTERD_MESSAGES_H_ */ |