From bafdf2a720fe14bf699793754d77168baa7cdc87 Mon Sep 17 00:00:00 2001
From: Avra Sengupta <asengupt@redhat.com>
Date: Thu, 20 Aug 2015 14:40:29 +0530
Subject: [PATCH 290/304] snapshot: Log deletion of snapshot, during auto-delete
When auto-delete is enabled, and soft-limit is reached,
on creation of a snapshot, the oldest snapshot for that
volume is deleted.
Displaying a warning log before deleting the oldest
snapshot.
Change-Id: I75f0366935966a223b63a4ec5ac13f9fe36c0e82
BUG: 1231080
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/11963
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: mohammed rafi kc <rkavunga@redhat.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/56045
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
---
xlators/mgmt/glusterd/src/glusterd-messages.h | 2 +-
xlators/mgmt/glusterd/src/glusterd-snapshot.c | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/xlators/mgmt/glusterd/src/glusterd-messages.h b/xlators/mgmt/glusterd/src/glusterd-messages.h
index 8f80e99..addd3e2 100644
--- a/xlators/mgmt/glusterd/src/glusterd-messages.h
+++ b/xlators/mgmt/glusterd/src/glusterd-messages.h
@@ -776,7 +776,7 @@
* @recommendedaction
*
*/
-#define GD_MSG_SNAPSHOT_OP_SUCCESS (GLUSTERD_COMP_BASE + 91)
+#define GD_MSG_OP_SUCCESS (GLUSTERD_COMP_BASE + 91)
/*!
* @messageid
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
index 34cafd8..080aa88 100644
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
@@ -5974,7 +5974,7 @@ glusterd_snapshot_remove_commit (dict_t *dict, char **op_errstr,
goto out;
} else
gf_msg (this->name, GF_LOG_INFO, 0,
- GD_MSG_SNAPSHOT_OP_SUCCESS, "Successfully marked "
+ GD_MSG_OP_SUCCESS, "Successfully marked "
"snap %s for decommission.", snap->snapname);
if (is_origin_glusterd (dict) == _gf_true) {
@@ -7727,6 +7727,12 @@ glusterd_handle_snap_limit (dict_t *dict, dict_t *rsp_dict)
snap = tmp_volinfo->snapshot;
GF_ASSERT (snap);
+ gf_msg (this->name, GF_LOG_WARNING, 0,
+ GD_MSG_SOFT_LIMIT_REACHED, "Soft-limit "
+ "(value = %"PRIu64") of volume %s is reached. "
+ "Deleting snapshot %s.", limit, volinfo->volname,
+ snap->snapname);
+
LOCK (&snap->lock);
{
snap->snap_status = GD_SNAP_STATUS_DECOMMISSION;
--
1.7.1