[Gfarm-commits] SF.net SVN: gfarm:[8822] gfarm_v2/branches/2.5

[<ta...@us...>]

Revision: 8822
          http://sourceforge.net/p/gfarm/code/8822
Author:   tatebe
Date:     2014-01-22 07:54:01 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
change log level for invalid replication from warning to notice

Modified Paths:
--------------
    gfarm_v2/branches/2.5/gftool/gfrep/Makefile
    gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfm_client.c
    gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfm_client.h
    gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfp_xdr.c
    gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfp_xdr.h
    gfarm_v2/branches/2.5/server/gfmd/process.c
    gfarm_v2/branches/2.5/server/gfsd/gfsd.c

Modified: gfarm_v2/branches/2.5/gftool/gfrep/Makefile
===================================================================
--- gfarm_v2/branches/2.5/gftool/gfrep/Makefile	2014-01-21 12:23:44 UTC (rev 8821)
+++ gfarm_v2/branches/2.5/gftool/gfrep/Makefile	2014-01-22 07:54:01 UTC (rev 8822)
@@ -6,8 +6,10 @@
 
 include $(top_srcdir)/makes/var.mk
 
-SRCS = gfrep.c gfarm_list.c
-OBJS = gfrep.o gfarm_list.o
+#SRCS = gfrep.c gfarm_list.c
+#OBJS = gfrep.o gfarm_list.o
+SRCS = gfrep_simple.c
+OBJS = gfrep_simple.o
 PROGRAM = gfrep
 #CC = omcc
 #OMPFLAGS = -fopenmp

Modified: gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfm_client.c
===================================================================
--- gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfm_client.c	2014-01-21 12:23:44 UTC (rev 8821)
+++ gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfm_client.c	2014-01-22 07:54:01 UTC (rev 8822)
@@ -82,6 +82,12 @@
 	return (IS_CONNECTION_ERROR(e));
 }
 
+int
+gfm_client_connection_empty(struct gfm_connection *gfm_server)
+{
+	return (gfp_xdr_is_empty(gfm_server->conn));
+}
+
 struct gfp_xdr *
 gfm_client_connection_conn(struct gfm_connection *gfm_server)
 {

Modified: gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfm_client.h
===================================================================
--- gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfm_client.h	2014-01-21 12:23:44 UTC (rev 8821)
+++ gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfm_client.h	2014-01-22 07:54:01 UTC (rev 8822)
@@ -27,6 +27,7 @@
 };
 void gfarm_host_sched_info_free(int, struct gfarm_host_sched_info *);
 
+int gfm_client_connection_empty(struct gfm_connection *);
 int gfm_client_is_connection_error(gfarm_error_t);
 struct gfp_xdr *gfm_client_connection_conn(struct gfm_connection *);
 int gfm_client_connection_fd(struct gfm_connection *);

Modified: gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfp_xdr.c
===================================================================
--- gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfp_xdr.c	2014-01-21 12:23:44 UTC (rev 8821)
+++ gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfp_xdr.c	2014-01-22 07:54:01 UTC (rev 8822)
@@ -217,6 +217,13 @@
 		gfarm_iobuffer_is_eof(conn->recvbuffer));
 }
 
+int
+gfp_xdr_is_empty(struct gfp_xdr *conn)
+{
+	return (gfarm_iobuffer_empty(conn->recvbuffer) &&
+		gfarm_iobuffer_empty(conn->sendbuffer));
+}
+
 gfarm_error_t
 gfp_xdr_flush(struct gfp_xdr *conn)
 {

Modified: gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfp_xdr.h
===================================================================
--- gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfp_xdr.h	2014-01-21 12:23:44 UTC (rev 8821)
+++ gfarm_v2/branches/2.5/lib/libgfarm/gfarm/gfp_xdr.h	2014-01-22 07:54:01 UTC (rev 8822)
@@ -60,6 +60,7 @@
 	struct gfp_xdr *);
 
 int gfp_xdr_recv_is_ready(struct gfp_xdr *);
+int gfp_xdr_is_empty(struct gfp_xdr *);
 gfarm_error_t gfp_xdr_flush(struct gfp_xdr *);
 gfarm_error_t gfp_xdr_purge(struct gfp_xdr *, int, int);
 void gfp_xdr_purge_all(struct gfp_xdr *);

Modified: gfarm_v2/branches/2.5/server/gfmd/process.c
===================================================================
--- gfarm_v2/branches/2.5/server/gfmd/process.c	2014-01-21 12:23:44 UTC (rev 8821)
+++ gfarm_v2/branches/2.5/server/gfmd/process.c	2014-01-22 07:54:01 UTC (rev 8822)
@@ -1239,7 +1239,7 @@
 	    mtime_nsec != mtime->tv_nsec ||
 	    (size != -1 && size != inode_get_size(fo->inode)) ||
 	    fo->u.f.replica_source->gen != inode_get_gen(fo->inode)) {
-		gflog_warning(GFARM_MSG_1002244,
+		gflog_notice(GFARM_MSG_1002244,
 		    "inode(%lld) updated during replication: "
 		    "mtime %lld.%09lld/%lld.%09lld, "
 		    "size: %lld/%lld, gen:%lld/%lld",

Modified: gfarm_v2/branches/2.5/server/gfsd/gfsd.c
===================================================================
--- gfarm_v2/branches/2.5/server/gfsd/gfsd.c	2014-01-21 12:23:44 UTC (rev 8821)
+++ gfarm_v2/branches/2.5/server/gfsd/gfsd.c	2014-01-22 07:54:01 UTC (rev 8822)
@@ -3623,6 +3623,12 @@
 			cleanup(0);
 			exit(1);
 		}
+		if (!gfm_client_connection_empty(gfm_server)) {
+			gflog_warning(GFARM_MSG_UNFIXED, "protocol mismatch, "
+			    "iobuffer not empty: request = %d", request);
+			cleanup(0);
+			exit(1);
+		}
 		if (gfm_client_is_connection_error(
 		    gfp_xdr_flush(gfm_client_connection_conn(gfm_server)))) {
 			free_gfm_server();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.