heal: glfs-heal implementation

Thanks a lot to Niels for helping me to get build stuff right. Change-Id: I634f24d90cd856ceab3cc0c6e9a91003f443403e BUG: 1147462 Signed-off-by: Pranith Kumar K <[email protected]> Reviewed-on: http://review.gluster.org/6529 Reviewed-by: Krutika Dhananjay <[email protected]> Tested-by: Gluster Build System <[email protected]>
gluster · Dec 15, 2013 · 31e7298 · 31e7298
1 parent 9d82d85
commit 31e7298
Show file tree

Hide file tree

Showing 14 changed files with 870 additions and 62 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -10,9 +10,8 @@ EXTRA_DIST = autogen.sh \
 	$(shell find $(top_srcdir)/tests -type f -print)
 
 SUBDIRS = $(ARGP_STANDALONE_DIR) libglusterfs rpc api xlators glusterfsd \
-	$(FUSERMOUNT_SUBDIR) doc extras cli @SYNCDAEMON_SUBDIR@ \
+	$(FUSERMOUNT_SUBDIR) doc extras cli heal @SYNCDAEMON_SUBDIR@ \
 	@UMOUNTD_SUBDIR@
-
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = glusterfs-api.pc libgfchangelog.pc

diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
@@ -16,6 +16,7 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <netinet/in.h>
 
 #ifndef _CONFIG_H
@@ -1903,6 +1904,10 @@ cli_cmd_volume_heal_cbk (struct cli_state *state, struct cli_cmd_word *word,
         dict_t                  *options = NULL;
         xlator_t                *this = NULL;
         cli_local_t             *local = NULL;
+        int                     heal_op = 0;
+        runner_t                runner = {0};
+        char                    buff[PATH_MAX] = {0};
+        char                    *out = NULL;
 
         this = THIS;
         frame = create_frame (this, this->ctx->pool);
@@ -1921,13 +1926,33 @@ cli_cmd_volume_heal_cbk (struct cli_state *state, struct cli_cmd_word *word,
                 parse_error = 1;
                 goto out;
         }
+        ret = dict_get_int32 (options, "heal-op", &heal_op);
+        if (ret < 0)
+                goto out;
 
-        proc = &cli_rpc_prog->proctable[GLUSTER_CLI_HEAL_VOLUME];
+        if (heal_op == GF_AFR_OP_INDEX_SUMMARY) {
+                runinit (&runner);
+                runner_add_args (&runner, SBIN_DIR"/glfsheal", words[2], NULL);
+                runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
+                ret = runner_start (&runner);
+                if (ret == -1)
+                        goto out;
+                while ((out = fgets(buff, sizeof(buff),
+                                   runner_chio (&runner, STDOUT_FILENO)))) {
+                        printf ("%s", out);
+                }
 
-        CLI_LOCAL_INIT (local, words, frame, options);
+                ret = runner_end (&runner);
+                ret = WEXITSTATUS (ret);
+        }
+        else {
+                proc = &cli_rpc_prog->proctable[GLUSTER_CLI_HEAL_VOLUME];
 
-        if (proc->fn) {
-                ret = proc->fn (frame, THIS, options);
+                CLI_LOCAL_INIT (local, words, frame, options);
+
+                if (proc->fn) {
+                        ret = proc->fn (frame, THIS, options);
+                }
         }
 
 out:

diff --git a/configure.ac b/configure.ac
@@ -210,6 +210,8 @@ AC_CONFIG_FILES([Makefile
                 geo-replication/Makefile
                 geo-replication/src/Makefile
                 geo-replication/syncdaemon/Makefile
+                heal/Makefile
+                heal/src/Makefile
                 glusterfs.spec])
 
 AC_CANONICAL_HOST

diff --git a/glusterfs.spec.in b/glusterfs.spec.in
@@ -995,6 +995,7 @@ fi
 %endif
 # binaries
 %{_sbindir}/glusterd
+%{_sbindir}/glfsheal
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage*
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server*

diff --git a/heal/Makefile.am b/heal/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = src
+
+CLEANFILES =
diff --git a/heal/src/Makefile.am b/heal/src/Makefile.am
@@ -0,0 +1,35 @@
+sbin_PROGRAMS = glfsheal
+
+glfsheal_SOURCES = glfs-heal.c
+
+glfsheal_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD)\
+		$(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la \
+		$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+		$(top_builddir)/api/src/libgfapi.la \
+		$(top_builddir)/xlators/cluster/afr/src/afr.la \
+		$(GF_GLUSTERFS_LIBS) $(XML_LIBS)
+
+glfsheal_LDFLAGS = $(GF_LDFLAGS)
+
+AM_CPPFLAGS = $(GF_CPPFLAGS) \
+	-I$(top_srcdir)/xlators/lib/src\
+	-I$(top_srcdir)/xlators/cluster/afr/src\
+	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src\
+	-I$(top_srcdir)/rpc/xdr/src\
+	-I$(top_srcdir)/api/src\
+	-I$(top_srcdir)/contrib/argp-standalone\
+	-DDATADIR=\"$(localstatedir)\" \
+	-DCONFDIR=\"$(sysconfdir)/glusterfs\" \
+	-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
+	-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\
+	$(XML_CPPFLAGS)
+
+AM_CFLAGS = -Wall $(GF_GLUSTERFS_CFLAGS)
+
+CLEANFILES =
+
+$(top_builddir)/libglusterfs/src/libglusterfs.la:
+	$(MAKE) -C $(top_builddir)/libglusterfs/src/ all
+
+$(top_builddir)/xlators/cluster/afr/src/afr.la:
+	$(MAKE) -C $(top_builddir)/xlators/cluster/afr/src/ all