[Pvfs2-cvs] commit by rzhong in pvfs2/src/apps/admin: pvfs2-admin-common.c pvfs2-migrate-collection.c pvfs2-mkspace.c

CVS commit program cvs at parl.clemson.edu
Fri Aug 22 18:15:05 EDT 2008


Update of /projects/cvsroot/pvfs2/src/apps/admin
In directory parlweb1:/tmp/cvs-serv19592/src/apps/admin

Modified Files:
      Tag: rongrong
	pvfs2-admin-common.c pvfs2-migrate-collection.c 
	pvfs2-mkspace.c 
Log Message:
dspace, keyval, coll_attr dbs are now created within the environment.
A whole lot of other things try to make replication work



Index: pvfs2-admin-common.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/Attic/pvfs2-admin-common.c,v
diff -p -u -r1.1.2.1 -r1.1.2.2
--- pvfs2-admin-common.c	24 Jul 2008 21:29:42 -0000	1.1.2.1
+++ pvfs2-admin-common.c	22 Aug 2008 22:15:04 -0000	1.1.2.2
@@ -7,7 +7,7 @@
 #include "server-config.h"
 
 job_context_id server_job_context;
-static server_configuration_s server_config;
+//static server_configuration_s server_config;
 
 server_configuration_s *get_server_config_struct()
 {

Index: pvfs2-migrate-collection.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-migrate-collection.c,v
diff -p -u -r1.21 -r1.21.4.1
--- pvfs2-migrate-collection.c	4 Apr 2008 16:39:47 -0000	1.21
+++ pvfs2-migrate-collection.c	22 Aug 2008 22:15:05 -0000	1.21.4.1
@@ -76,7 +76,7 @@ static int src_get_version_0_0_1(
     char* ver_string, int ver_string_max);
 static int translate_0_0_1(
     char* storage_space, char* old_coll_path, 
-    char* coll_name, TROVE_coll_id coll_id);
+    char* coll_name, TROVE_coll_id coll_id, int is_dbrep_master);
 static int translate_coll_eattr_0_0_1(
     char* old_coll_path, TROVE_coll_id coll_id, char* coll_name,
     TROVE_context_id trove_context);
@@ -293,7 +293,7 @@ int migrate_collection(void * config, vo
         ret = translate_0_0_1(
             server_config->storage_path, old_coll_path, 
             fs_config->file_system_name, 
-            fs_config->coll_id);
+            fs_config->coll_id, server_config->is_rep_master);
         if(ret < 0)
         {
             fprintf(stderr, 
@@ -631,7 +631,8 @@ static int translate_0_0_1(
     char* storage_space,   /**< path to storage space */
     char* old_coll_path,   /**< path to old collection */
     char* coll_name,       /**< collection name */
-    TROVE_coll_id coll_id) /**< collection id in string format */
+    TROVE_coll_id coll_id, /**< collection id in string format */
+    int is_dbrep_master)   /**< whether the server is db repliacation master */
 {
     int ret = -1;
     /* choose a handle range big enough to encompass anything pvfs2-genconfig
@@ -681,6 +682,7 @@ static int translate_0_0_1(
         coll_name,
         coll_id, 
         TROVE_HANDLE_NULL,
+	is_dbrep_master,
         handle_range,
         NULL,
         1,

Index: pvfs2-mkspace.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-mkspace.c,v
diff -p -u -r1.20.24.1 -r1.20.24.2
--- pvfs2-mkspace.c	24 Jul 2008 21:24:51 -0000	1.20.24.1
+++ pvfs2-mkspace.c	22 Aug 2008 22:15:05 -0000	1.20.24.2
@@ -327,7 +327,7 @@ int main(int argc, char **argv)
     else
     {
         ret = pvfs2_mkspace(opts.storage_space, opts.collection,
-                            opts.coll_id, opts.root_handle,
+                            opts.coll_id, opts.root_handle, 1,
                             opts.meta_ranges, opts.data_ranges,
                             opts.collection_only, opts.verbose);
     }



More information about the Pvfs2-cvs mailing list