glusterfs.git -

diff options

author	Manikandan Selvaganesh <mselvaga@redhat.com>	2015-10-13 14:28:03 +0530
committer	Kaushal M <kaushal@redhat.com>	2015-10-14 23:42:46 -0700
commit	0f72aa8668a6d2da4cce9cd04296454f2bc99d58 (patch)
tree	3555b5dfab8a10674e55d633ab0360988c4888bb /cli/src/cli-cmd-peer.c
parent	8629457bfc0347b0ad459ed0ce69a5f35c1314c7 (diff)

cli/quota : rm -rf on /<mountpoint>/<dir> is not showing quota header

Currently, when 'gluster v quota <VOLNAME> list' command is issued after an rm -rf on /run/gluster/vol/<directory>, quota output header is not shown. It is because the list_count was properly calculated with 'gluster v quota <VOLNAME> remove /path' and not with an rm -rf. The patch fixes this issue. Backport of http://review.gluster.org/#/c/12345/ Cherry-picked from commit 00eeb153f4ea473c6636147f6c72c04336128198 > Change-Id: I5266a8b0b9322b7db1b9e1d6b0327065931f4bcb > BUG: 1269375 > Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com> > Reviewed-on: http://review.gluster.org/12345 > Reviewed-by: Vijaikumar Mallikarjuna <vmallika@redhat.com> > Tested-by: NetBSD Build System <jenkins@build.gluster.org> > Tested-by: Gluster Build System <jenkins@build.gluster.com> > Reviewed-by: Kaushal M <kaushal@redhat.com> Change-Id: I5266a8b0b9322b7db1b9e1d6b0327065931f4bcb BUG: 1271490 Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com> Reviewed-on: http://review.gluster.org/12356 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaushal M <kaushal@redhat.com>

Diffstat (limited to 'cli/src/cli-cmd-peer.c')

0 files changed, 0 insertions, 0 deletions

/* Copyright (c) 2010-2012 Red Hat, Inc. <http://www.redhat.com> This file is part of GlusterFS. This file is licensed to you under your choice of the GNU Lesser General Public License, version 3 or any later version (LGPLv3 or later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ #include <stdio.h> #include <string.h> #include <stdlib.h> #include <stdint.h> #include <pthread.h> #include "cli.h" #include "cli-cmd.h" #include "cli-mem-types.h" #include "protocol-common.h" #include <fnmatch.h> static int cmd_done; static int cmd_sent; static pthread_cond_t cond = PTHREAD_COND_INITIALIZER; static pthread_mutex_t cond_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t conn = PTHREAD_COND_INITIALIZER; static pthread_mutex_t conn_mutex = PTHREAD_MUTEX_INITIALIZER; int cli_op_ret = 0; int connected = 0; int cli_cmd_log_help_cbk (struct cli_state *state, struct cli_cmd_word *in_word, const char **words, int wordcount); static unsigned cli_cmd_needs_connection (struct cli_cmd_word *word) { if (!strcasecmp ("quit", word->word)) return 0; if (!strcasecmp ("help", word->word)) return 0; if (!strcasecmp ("getwd", word->word)) return 1; if (!strcasecmp ("exit", word->word)) return 0; return CLI_DEFAULT_CONN_TIMEOUT; } int cli_cmd_status_reset (void) { int ret = 0; ret = cli_cmd_lock (); { if (ret == 0) { cmd_sent = 0; cmd_done = 0; } } ret = cli_cmd_unlock (); return ret; } int cli_cmd_sent_status_get (int *status) { int ret = 0; GF_ASSERT (status); ret = cli_cmd_lock (); { if (ret == 0) *status = cmd_sent; } ret = cli_cmd_unlock (); return ret; } int cli_cmd_process (struct cli_state *state, int argc, char **argv) { int ret = 0; struct cli_cmd_word *word = NULL; struct cli_cmd_word *next = NULL; int i = 0; word = &state->tree.root; if (!argc) return 0; for (i = 0; i < argc; i++) { next = cli_cmd_nextword (word, argv[i]); word = next; if (!word) break; if (word->cbkfn) break; } if (!word) { cli_out ("unrecognized word: %s (position %d)", argv[i], i); return -1; } if (!word->cbkfn) { cli_out ("unrecognized command"); return -1; } if ( strcmp (word->word,"help")==0 ) goto callback; state->await_connected = cli_cmd_needs_connection (word); ret = cli_cmd_await_connected (state->await_connected); if (ret) { cli_out ("Connection failed. Please check if gluster " "daemon is operational."); gf_log ("", GF_LOG_INFO, "Exiting with: %d", ret); exit (ret); } callback: ret = word->cbkfn (state, word, (const char **)argv, argc); (void) cli_cmd_status_reset (); return ret; } int cli_cmd_input_token_count (const char *text) { int count = 0; const char *trav = NULL; int is_spc = 1; for (trav = text; *trav; trav++) { if (*trav == ' ') { is_spc = 1; } else { if (is_spc) { count++; is_spc = 0; } } } return count; } int cli_cmd_process_line (struct cli_state *state, const char *text) { int count = 0; char **tokens = NULL; char **tokenp = NULL; char *token = NULL; char *copy = NULL; char *saveptr = NULL; int i = 0; int ret = -1; count = cli_cmd_input_token_count (text); tokens = calloc (count + 1, sizeof (*tokens)); if (!tokens) return -1; copy = strdup (text); if (!copy) goto out; tokenp = tokens; for (token = strtok_r (copy, " \t\r\n", &saveptr); token; token = strtok_r (NULL, " \t\r\n", &saveptr)) { *tokenp = strdup (token); if (!*tokenp) goto out; tokenp++; i++; } ret = cli_cmd_process (state, count, tokens); out: free (copy); if (tokens) cli_cmd_tokens_destroy (tokens); return ret; } int cli_cmds_register (struct cli_state *state) { int ret = 0; ret = cli_cmd_volume_register (state); if (ret) goto out; ret = cli_cmd_probe_register (state); if (ret) goto out; ret = cli_cmd_system_register (state); if (ret) goto out; ret = cli_cmd_misc_register (state); if (ret) goto out; ret = cli_cmd_snapshot_register (state); if (ret) goto out; ret = cli_cmd_global_register (state); if (ret) goto out; out: return ret; } int cli_cmd_cond_init () { pthread_mutex_init (&cond_mutex, NULL); pthread_cond_init (&cond, NULL); pthread_mutex_init (&conn_mutex, NULL); pthread_cond_init (&conn, NULL); return 0; } int cli_cmd_lo


context:
space:
mode: