|
|
3604df |
From f01d3229830e47d42a6543b45c7a843ba43eb7c2 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
3604df |
Date: Tue, 18 Oct 2016 15:16:17 +0530
|
|
|
3604df |
Subject: [PATCH 175/206] events: Add FMT_WARN for gf_event
|
|
|
3604df |
|
|
|
3604df |
Raghavendra G found that posix is trying to print %s
|
|
|
3604df |
but passing an int when HEALTH_CHECK fails in posix.
|
|
|
3604df |
These are the kind of bugs that should be caught
|
|
|
3604df |
at compilation itself.
|
|
|
3604df |
Also fixed the problematic gf_event() callers.
|
|
|
3604df |
|
|
|
3604df |
>BUG: 1386097
|
|
|
3604df |
>Change-Id: Id7bd6d9a9690237cec3ca1aefa2aac085e8a1270
|
|
|
3604df |
>Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
3604df |
>Reviewed-on: http://review.gluster.org/15671
|
|
|
3604df |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
|
|
|
3604df |
BUG: 1385606
|
|
|
3604df |
Change-Id: I415a5346c556f375311cdb2db8e8d09a3a289a9b
|
|
|
3604df |
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/90550
|
|
|
3604df |
---
|
|
|
3604df |
cli/src/cli-cmd-volume.c | 4 ++--
|
|
|
3604df |
libglusterfs/src/events.c | 2 +-
|
|
|
3604df |
libglusterfs/src/events.h | 10 ++++++++--
|
|
|
3604df |
xlators/cluster/afr/src/afr-self-heal-common.c | 5 ++++-
|
|
|
3604df |
xlators/cluster/dht/src/dht-rebalance.c | 2 +-
|
|
|
3604df |
xlators/mgmt/glusterd/src/glusterd-svc-helper.c | 13 ++++++++++---
|
|
|
3604df |
xlators/mgmt/glusterd/src/glusterd-utils.c | 13 +++----------
|
|
|
3604df |
xlators/storage/posix/src/posix-helpers.c | 2 +-
|
|
|
3604df |
8 files changed, 30 insertions(+), 21 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
|
|
|
3604df |
index 998bf46..b4fdecd 100644
|
|
|
3604df |
--- a/cli/src/cli-cmd-volume.c
|
|
|
3604df |
+++ b/cli/src/cli-cmd-volume.c
|
|
|
3604df |
@@ -1065,7 +1065,7 @@ out:
|
|
|
3604df |
cli_out ("Volume add-brick failed");
|
|
|
3604df |
} else {
|
|
|
3604df |
#if (USE_EVENTS)
|
|
|
3604df |
- gf_event (EVENT_VOLUME_ADD_BRICK, event_str);
|
|
|
3604df |
+ gf_event (EVENT_VOLUME_ADD_BRICK, "%s", event_str);
|
|
|
3604df |
GF_FREE (event_str);
|
|
|
3604df |
#endif
|
|
|
3604df |
}
|
|
|
3604df |
@@ -2055,7 +2055,7 @@ out:
|
|
|
3604df |
} else {
|
|
|
3604df |
#if (USE_EVENTS)
|
|
|
3604df |
if (!event_ret) {
|
|
|
3604df |
- gf_event (event, event_str);
|
|
|
3604df |
+ gf_event (event, "%s", event_str);
|
|
|
3604df |
GF_FREE (event_str);
|
|
|
3604df |
}
|
|
|
3604df |
#endif
|
|
|
3604df |
diff --git a/libglusterfs/src/events.c b/libglusterfs/src/events.c
|
|
|
3604df |
index b7b513e..6b3a73d 100644
|
|
|
3604df |
--- a/libglusterfs/src/events.c
|
|
|
3604df |
+++ b/libglusterfs/src/events.c
|
|
|
3604df |
@@ -32,7 +32,7 @@
|
|
|
3604df |
|
|
|
3604df |
|
|
|
3604df |
int
|
|
|
3604df |
-gf_event (eventtypes_t event, char *fmt, ...)
|
|
|
3604df |
+_gf_event (eventtypes_t event, char *fmt, ...)
|
|
|
3604df |
{
|
|
|
3604df |
int ret = 0;
|
|
|
3604df |
int sock = -1;
|
|
|
3604df |
diff --git a/libglusterfs/src/events.h b/libglusterfs/src/events.h
|
|
|
3604df |
index 6b280a0..e059bc9 100644
|
|
|
3604df |
--- a/libglusterfs/src/events.h
|
|
|
3604df |
+++ b/libglusterfs/src/events.h
|
|
|
3604df |
@@ -15,13 +15,19 @@
|
|
|
3604df |
|
|
|
3604df |
#ifdef USE_EVENTS
|
|
|
3604df |
int
|
|
|
3604df |
-gf_event (eventtypes_t event, char *fmt, ...);
|
|
|
3604df |
+_gf_event (eventtypes_t event, char *fmt, ...);
|
|
|
3604df |
#else
|
|
|
3604df |
static inline int
|
|
|
3604df |
-gf_event (eventtypes_t event, char *fmt, ...)
|
|
|
3604df |
+_gf_event (eventtypes_t event, char *fmt, ...)
|
|
|
3604df |
{
|
|
|
3604df |
return 0;
|
|
|
3604df |
}
|
|
|
3604df |
#endif /* USE_EVENTS */
|
|
|
3604df |
|
|
|
3604df |
+#define gf_event(event, fmt...) \
|
|
|
3604df |
+ do { \
|
|
|
3604df |
+ FMT_WARN(fmt); \
|
|
|
3604df |
+ _gf_event (event, ##fmt); \
|
|
|
3604df |
+ } while (0)
|
|
|
3604df |
+
|
|
|
3604df |
#endif /* __EVENTS_H__ */
|
|
|
3604df |
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c
|
|
|
3604df |
index 8d73a80..3110c1a 100644
|
|
|
3604df |
--- a/xlators/cluster/afr/src/afr-self-heal-common.c
|
|
|
3604df |
+++ b/xlators/cluster/afr/src/afr-self-heal-common.c
|
|
|
3604df |
@@ -1604,6 +1604,7 @@ afr_selfheal_unlocked_inspect (call_frame_t *frame, xlator_t *this,
|
|
|
3604df |
int i = 0;
|
|
|
3604df |
int valid_cnt = 0;
|
|
|
3604df |
struct iatt first = {0, };
|
|
|
3604df |
+ int first_idx = 0;
|
|
|
3604df |
struct afr_reply *replies = NULL;
|
|
|
3604df |
int ret = -1;
|
|
|
3604df |
|
|
|
3604df |
@@ -1643,6 +1644,7 @@ afr_selfheal_unlocked_inspect (call_frame_t *frame, xlator_t *this,
|
|
|
3604df |
valid_cnt++;
|
|
|
3604df |
if (valid_cnt == 1) {
|
|
|
3604df |
first = replies[i].poststat;
|
|
|
3604df |
+ first_idx = i;
|
|
|
3604df |
continue;
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
@@ -1658,7 +1660,8 @@ afr_selfheal_unlocked_inspect (call_frame_t *frame, xlator_t *this,
|
|
|
3604df |
"type=file;gfid=%s;"
|
|
|
3604df |
"ia_type-%d=%s;ia_type-%d=%s",
|
|
|
3604df |
this->name,
|
|
|
3604df |
- uuid_utoa (replies[i].poststat.ia_gfid), first,
|
|
|
3604df |
+ uuid_utoa (replies[i].poststat.ia_gfid),
|
|
|
3604df |
+ first_idx,
|
|
|
3604df |
gf_inode_type_to_str (first.ia_type), i,
|
|
|
3604df |
gf_inode_type_to_str (replies[i].poststat.ia_type));
|
|
|
3604df |
ret = -EIO;
|
|
|
3604df |
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
|
|
|
3604df |
index 5d28e0a..2373e9d 100644
|
|
|
3604df |
--- a/xlators/cluster/dht/src/dht-rebalance.c
|
|
|
3604df |
+++ b/xlators/cluster/dht/src/dht-rebalance.c
|
|
|
3604df |
@@ -149,7 +149,7 @@ dht_send_rebalance_event (xlator_t *this, int cmd, gf_defrag_status_t status)
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
if (event != EVENT_LAST) {
|
|
|
3604df |
- ret = gf_event (event, "volume=%s", volname);
|
|
|
3604df |
+ gf_event (event, "volume=%s", volname);
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
GF_FREE (tmpstr);
|
|
|
3604df |
diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
|
|
|
3604df |
index 72f0092..70a12df 100644
|
|
|
3604df |
--- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
|
|
|
3604df |
+++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
|
|
|
3604df |
@@ -28,16 +28,19 @@ glusterd_svcs_reconfigure ()
|
|
|
3604df |
int ret = 0;
|
|
|
3604df |
xlator_t *this = THIS;
|
|
|
3604df |
glusterd_conf_t *conf = NULL;
|
|
|
3604df |
+ char *svc_name = NULL;
|
|
|
3604df |
|
|
|
3604df |
GF_ASSERT (this);
|
|
|
3604df |
|
|
|
3604df |
conf = this->private;
|
|
|
3604df |
GF_ASSERT (conf);
|
|
|
3604df |
|
|
|
3604df |
+ svc_name = "nfs";
|
|
|
3604df |
ret = glusterd_nfssvc_reconfigure ();
|
|
|
3604df |
if (ret)
|
|
|
3604df |
goto out;
|
|
|
3604df |
|
|
|
3604df |
+ svc_name = "self-heald";
|
|
|
3604df |
ret = glusterd_shdsvc_reconfigure ();
|
|
|
3604df |
if (ret)
|
|
|
3604df |
goto out;
|
|
|
3604df |
@@ -45,20 +48,24 @@ glusterd_svcs_reconfigure ()
|
|
|
3604df |
if (conf->op_version == GD_OP_VERSION_MIN)
|
|
|
3604df |
goto out;
|
|
|
3604df |
|
|
|
3604df |
+ svc_name = "quotad";
|
|
|
3604df |
ret = glusterd_quotadsvc_reconfigure ();
|
|
|
3604df |
if (ret)
|
|
|
3604df |
goto out;
|
|
|
3604df |
|
|
|
3604df |
+ svc_name = "bitd";
|
|
|
3604df |
ret = glusterd_bitdsvc_reconfigure ();
|
|
|
3604df |
if (ret)
|
|
|
3604df |
goto out;
|
|
|
3604df |
+
|
|
|
3604df |
+ svc_name = "scrubber";
|
|
|
3604df |
ret = glusterd_scrubsvc_reconfigure ();
|
|
|
3604df |
if (ret)
|
|
|
3604df |
goto out;
|
|
|
3604df |
out:
|
|
|
3604df |
- if (ret)
|
|
|
3604df |
- gf_event (EVENT_SVC_RECONFIGURE_FAILED, "");
|
|
|
3604df |
-
|
|
|
3604df |
+ if (ret && svc_name)
|
|
|
3604df |
+ gf_event (EVENT_SVC_RECONFIGURE_FAILED, "svc_name=%s",
|
|
|
3604df |
+ svc_name);
|
|
|
3604df |
return ret;
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
3604df |
index df0c0ab..8955994 100644
|
|
|
3604df |
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
3604df |
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
3604df |
@@ -4384,10 +4384,7 @@ glusterd_compare_friend_data (dict_t *peer_data, int32_t *status,
|
|
|
3604df |
ret = glusterd_import_friend_volumes (peer_data);
|
|
|
3604df |
if (ret)
|
|
|
3604df |
goto out;
|
|
|
3604df |
-
|
|
|
3604df |
- if (glusterd_svcs_manager (NULL)) {
|
|
|
3604df |
- gf_event (EVENT_SVC_MANAGER_FAILED, "");
|
|
|
3604df |
- }
|
|
|
3604df |
+ glusterd_svcs_manager (NULL);
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
out:
|
|
|
3604df |
@@ -4916,9 +4913,7 @@ glusterd_restart_bricks (glusterd_conf_t *conf)
|
|
|
3604df |
continue;
|
|
|
3604df |
if (start_svcs == _gf_false) {
|
|
|
3604df |
start_svcs = _gf_true;
|
|
|
3604df |
- if (glusterd_svcs_manager (NULL)) {
|
|
|
3604df |
- gf_event (EVENT_SVC_MANAGER_FAILED, "");
|
|
|
3604df |
- }
|
|
|
3604df |
+ glusterd_svcs_manager (NULL);
|
|
|
3604df |
}
|
|
|
3604df |
gf_msg_debug (this->name, 0, "starting the volume %s",
|
|
|
3604df |
volinfo->volname);
|
|
|
3604df |
@@ -4968,9 +4963,7 @@ glusterd_restart_bricks (glusterd_conf_t *conf)
|
|
|
3604df |
}
|
|
|
3604df |
if (start_svcs == _gf_false) {
|
|
|
3604df |
start_svcs = _gf_true;
|
|
|
3604df |
- if (glusterd_svcs_manager (volinfo)) {
|
|
|
3604df |
- gf_event (EVENT_SVC_MANAGER_FAILED, "");
|
|
|
3604df |
- }
|
|
|
3604df |
+ glusterd_svcs_manager (volinfo);
|
|
|
3604df |
}
|
|
|
3604df |
start_svcs = _gf_true;
|
|
|
3604df |
gf_msg_debug (this->name, 0, "starting the snap "
|
|
|
3604df |
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c
|
|
|
3604df |
index 2912896..24b8bdd 100644
|
|
|
3604df |
--- a/xlators/storage/posix/src/posix-helpers.c
|
|
|
3604df |
+++ b/xlators/storage/posix/src/posix-helpers.c
|
|
|
3604df |
@@ -1778,7 +1778,7 @@ out:
|
|
|
3604df |
"%s() on %s returned", op, file_path);
|
|
|
3604df |
gf_event (EVENT_POSIX_HEALTH_CHECK_FAILED,
|
|
|
3604df |
"op=%s;path=%s;error=%s;brick=%s:%s", op, file_path,
|
|
|
3604df |
- op_errno, priv->hostname, priv->base_path);
|
|
|
3604df |
+ strerror (op_errno), priv->hostname, priv->base_path);
|
|
|
3604df |
}
|
|
|
3604df |
return ret;
|
|
|
3604df |
|
|
|
3604df |
--
|
|
|
3604df |
2.9.3
|
|
|
3604df |
|