summaryrefslogtreecommitdiffstats
path: root/heal/src
diff options
context:
space:
mode:
authorRavishankar N <ravishankar@redhat.com>2018-10-26 17:51:38 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2018-11-26 08:36:13 +0000
commitfc9889d0373c323aab0d93f8ca31d2d8151bd041 (patch)
treedba250cf1a43b737f41c6f009040446e9fcd16f4 /heal/src
parentb346c84ad5f090c3d99dc1cb80f24ca10747a085 (diff)
glfsheal: add a '--nolog' flag
....and if set, change the log level to GF_LOG_NONE. This is useful for monitoring applications which invoke the heal info set of commands once every minute, leading to un-necessary glfsheal* logs in /var/log/glusterfs/. For example, we can now run `gluster volume heal <VOLNAME> info --nolog` `gluster volume heal <VOLNAME> info split-brain --nolog` etc. The default log level is still retained at GF_LOG_INFO. The patch also changes glfsheal internally to accept '--xml' instead of 'xml'. Note: The --nolog flag is *not* displayed in the help anywhere, for the sake of consistency in how the other flags are not displayed anywhere in the help. fixes: bz#1643519 Change-Id: Ia08b6aa6e4a0548379db7e313dd4411ebc66f206 Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Diffstat (limited to 'heal/src')
-rw-r--r--heal/src/glfs-heal.c59
1 files changed, 45 insertions, 14 deletions
diff --git a/heal/src/glfs-heal.c b/heal/src/glfs-heal.c
index f0576f9..0ce9def 100644
--- a/heal/src/glfs-heal.c
+++ b/heal/src/glfs-heal.c
@@ -40,6 +40,9 @@ xmlDocPtr glfsh_doc = NULL;
ret = 0; \
} while (0)
+#define MODE_XML (1 << 0)
+#define MODE_NO_LOG (1 << 1)
+
typedef struct num_entries {
uint64_t num_entries;
uint64_t pending_entries;
@@ -1508,6 +1511,28 @@ glfsh_info_t glfsh_xml_output = {
.end = glfsh_xml_end};
#endif
+static void
+parse_flags(int *argc, char **argv, int *flags)
+{
+ int i = 0;
+ char *opt = NULL;
+ int count = 0;
+
+ for (i = 0; i < *argc; i++) {
+ opt = strtail(argv[i], "--");
+ if (!opt)
+ continue;
+ if (strcmp(opt, "nolog") == 0) {
+ *flags |= MODE_NO_LOG;
+ count++;
+ } else if (strcmp(opt, "xml") == 0) {
+ *flags |= MODE_XML;
+ count++;
+ }
+ }
+ *argc = *argc - count;
+}
+
int
main(int argc, char **argv)
{
@@ -1523,6 +1548,8 @@ main(int argc, char **argv)
char *op_errstr = NULL;
char *socket_filepath = NULL;
gf_xl_afr_op_t heal_op = -1;
+ gf_loglevel_t log_level = GF_LOG_INFO;
+ int flags = 0;
if (argc < 2) {
printf(USAGE_STR, argv[0]);
@@ -1535,6 +1562,13 @@ main(int argc, char **argv)
}
}
volname = argv[1];
+
+ parse_flags(&argc, argv, &flags);
+ if (flags & MODE_NO_LOG)
+ log_level = GF_LOG_NONE;
+ if (flags & MODE_XML)
+ is_xml = 1;
+
switch (argc) {
case 2:
heal_op = GF_SHD_OP_INDEX_SUMMARY;
@@ -1542,9 +1576,6 @@ main(int argc, char **argv)
case 3:
if (!strcmp(argv[2], "split-brain-info")) {
heal_op = GF_SHD_OP_SPLIT_BRAIN_FILES;
- } else if (!strcmp(argv[2], "xml")) {
- heal_op = GF_SHD_OP_INDEX_SUMMARY;
- is_xml = 1;
} else if (!strcmp(argv[2], "granular-entry-heal-op")) {
heal_op = GF_SHD_OP_GRANULAR_ENTRY_HEAL_ENABLE;
} else if (!strcmp(argv[2], "info-summary")) {
@@ -1556,15 +1587,7 @@ main(int argc, char **argv)
}
break;
case 4:
- if ((!strcmp(argv[2], "split-brain-info")) &&
- (!strcmp(argv[3], "xml"))) {
- heal_op = GF_SHD_OP_SPLIT_BRAIN_FILES;
- is_xml = 1;
- } else if ((!strcmp(argv[2], "info-summary")) &&
- (!strcmp(argv[3], "xml"))) {
- heal_op = GF_SHD_OP_HEAL_SUMMARY;
- is_xml = 1;
- } else if (!strcmp(argv[2], "bigger-file")) {
+ if (!strcmp(argv[2], "bigger-file")) {
heal_op = GF_SHD_OP_SBRAIN_HEAL_FROM_BIGGER_FILE;
file = argv[3];
} else if (!strcmp(argv[2], "latest-mtime")) {
@@ -1601,7 +1624,15 @@ main(int argc, char **argv)
glfsh_output = &glfsh_human_readable;
if (is_xml) {
#if (HAVE_LIB_XML)
- glfsh_output = &glfsh_xml_output;
+ if ((heal_op == GF_SHD_OP_INDEX_SUMMARY) ||
+ (heal_op == GF_SHD_OP_SPLIT_BRAIN_FILES) ||
+ (heal_op == GF_SHD_OP_HEAL_SUMMARY)) {
+ glfsh_output = &glfsh_xml_output;
+ } else {
+ printf(USAGE_STR, argv[0]);
+ ret = -1;
+ goto out;
+ }
#else
/*No point doing anything, just fail the command*/
exit(EXIT_FAILURE);
@@ -1647,7 +1678,7 @@ main(int argc, char **argv)
}
snprintf(logfilepath, sizeof(logfilepath),
DEFAULT_HEAL_LOG_FILE_DIRECTORY "/glfsheal-%s.log", volname);
- ret = glfs_set_logging(fs, logfilepath, GF_LOG_INFO);
+ ret = glfs_set_logging(fs, logfilepath, log_level);
if (ret < 0) {
ret = -errno;
gf_asprintf(&op_errstr,