[Pvfs2-cvs] commit by rzhong in pvfs2/src/server: module.mk.in pvfs2-server-req.c pvfs2-server.c

CVS commit program cvs at parl.clemson.edu
Thu Jul 24 17:24:58 EDT 2008


Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb1:/tmp/cvs-serv22855/src/server

Modified Files:
      Tag: rongrong
	module.mk.in pvfs2-server-req.c pvfs2-server.c 
Log Message:
db-rep-send state machine added


Index: module.mk.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/module.mk.in,v
diff -p -u -r1.53 -r1.53.6.1
--- module.mk.in	11 Feb 2008 17:25:29 -0000	1.53
+++ module.mk.in	24 Jul 2008 21:24:57 -0000	1.53.6.1
@@ -40,7 +40,8 @@ ifdef BUILD_SERVER
 		$(DIR)/set-eattr.c \
 		$(DIR)/del-eattr.c \
 		$(DIR)/list-eattr.c \
-		$(DIR)/unexpected.c
+		$(DIR)/unexpected.c \
+		$(DIR)/db-rep-send.c
 
 	# c files that should be added to server library
 	SERVERSRC += \

Index: pvfs2-server-req.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server-req.c,v
diff -p -u -r1.3 -r1.3.8.1
--- pvfs2-server-req.c	20 Feb 2008 14:44:52 -0000	1.3
+++ pvfs2-server-req.c	24 Jul 2008 21:24:57 -0000	1.3.8.1
@@ -82,6 +82,7 @@ struct PINT_server_req_entry PINT_server
     /* 32 */ {PVFS_SERV_LISTEATTR, &pvfs2_list_eattr_params},
     /* 33 */ {PVFS_SERV_SMALL_IO, &pvfs2_small_io_params},
     /* 34 */ {PVFS_SERV_LISTATTR, &pvfs2_list_attr_params},
+    /* 35 */ //{PVFS_SERV_DBREP, &pvfs2_dbrep_params},/*Rongrong*/
 };
 
 #define CHECK_OP(_op_) assert(_op_ == PINT_server_req_table[_op_].op_type)

Index: pvfs2-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.c,v
diff -p -u -r1.254.2.1 -r1.254.2.2
--- pvfs2-server.c	19 Jun 2008 00:14:34 -0000	1.254.2.1
+++ pvfs2-server.c	24 Jul 2008 21:24:57 -0000	1.254.2.2
@@ -693,6 +693,10 @@ static int server_initialize_subsystems(
     assert(ret == 0);
     ret = trove_collection_setinfo(0, 0, TROVE_MAX_CONCURRENT_IO,
                                    &server_config.trove_max_concurrent_io);
+    /*Rongrong: for replication*/
+    ret = trove_collection_setinfo(0, 0, TROVE_DB_REP_MASTER,
+				   &server_config.is_rep_master);
+
     /* this should never fail */
     assert(ret == 0);
 



More information about the Pvfs2-cvs mailing list