Changeset 7958

Timestamp:

09/02/09 17:10:52 (4 years ago)

Author:

dbonnie

Message:

Undo accidental commit to MAIN. Reverted each file to pre-commit version.

Location:

trunk

Files:

• src/apps/admin/pvfs2-change-fsid.c (modified) (8 diffs)
• src/apps/admin/pvfs2-genconfig (modified) (18 diffs)
• src/apps/admin/pvfs2-migrate-collection.c (modified) (32 diffs)
• src/apps/admin/pvfs2-mkspace.c (modified) (9 diffs)
• src/apps/admin/pvfs2-showcoll.c (modified) (8 diffs)
• src/common/misc/mkspace.c (modified) (9 diffs)
• src/common/misc/mkspace.h (modified) (2 diffs)
• src/common/misc/server-config.c (modified) (9 diffs)
• src/common/misc/server-config.h (modified) (1 diff)
• src/io/trove/trove-dbpf/dbpf-dspace.c (modified) (2 diffs)
• src/io/trove/trove-dbpf/dbpf-mgmt.c (modified) (51 diffs)
• src/io/trove/trove-dbpf/dbpf-open-cache.c (modified) (3 diffs)
• src/io/trove/trove-dbpf/dbpf.h (modified) (5 diffs)
• src/io/trove/trove-internal.h (modified) (4 diffs)
• src/io/trove/trove-mgmt.c (modified) (4 diffs)
• src/io/trove/trove-migrate.c (modified) (7 diffs)
• src/io/trove/trove.h (modified) (5 diffs)
• src/proto/endecode-funcs.h (modified) (1 diff)
• src/server/pvfs2-server.c (modified) (3 diffs)
• test/automated/README.tests (modified) (1 diff)
• test/io/buffer/trove-init.c (modified) (1 diff)
• test/io/flow/test-bmi-cache-server.c (modified) (1 diff)
• test/io/flow/test-harness-server-trove.c (modified) (1 diff)
• test/io/flow/test1-server.c (modified) (1 diff)
• test/io/job/job-client-example.c (modified) (1 diff)
• test/io/job/job-server-example.c (modified) (1 diff)
• test/io/job/module.mk.in (modified) (1 diff)
• test/io/job/trove-job-create-toy.c (modified) (1 diff)
• test/io/job/trove-job-ls.c (modified) (1 diff)
• test/io/job/trove-job-mkfs.c (modified) (3 diffs)
• test/io/job/trove-job-touch.c (modified) (1 diff)
• test/io/trove/test-listio.c (modified) (1 diff)
• test/io/trove/test-listio2.c (modified) (1 diff)
• test/io/trove/test-listio3.c (modified) (1 diff)
• test/io/trove/test-listio4.c (modified) (1 diff)
• test/io/trove/test-listio5.c (modified) (1 diff)
• test/io/trove/test-trove-cancel.c (modified) (1 diff)
• test/io/trove/trove-bstream.c (modified) (1 diff)
• test/io/trove/trove-create-stress.c (modified) (1 diff)
• test/io/trove/trove-export.c (modified) (1 diff)
• test/io/trove/trove-import.c (modified) (1 diff)
• test/io/trove/trove-key-iterate.c (modified) (1 diff)
• test/io/trove/trove-ls.c (modified) (1 diff)
• test/io/trove/trove-mkdir.c (modified) (1 diff)
• test/io/trove/trove-mkfs.c (modified) (3 diffs)
• test/io/trove/trove-rm.c (modified) (1 diff)
• test/io/trove/trove-rmdir.c (modified) (1 diff)
• test/io/trove/trove-touch.c (modified) (1 diff)
• test/server/showconfig.c (modified) (1 diff)

trunk/src/apps/admin/pvfs2-change-fsid.c

@@ -39 +39 @@
     char fs_conf[PATH_MAX];
     char fs_name[PATH_MAX];
-    char data_storage_path[PATH_MAX];
-    char meta_storage_path[PATH_MAX];
+    char storage_path[PATH_MAX];
     int32_t old_fsid;
     int32_t new_fsid;
@@ -315 +314 @@
 {
     FILE * fptr = NULL;
-    char datacommand[PATH_MAX];
-    char metacommand[PATH_MAX];
-    char dataoutput[PATH_MAX];
-    char metaoutput[PATH_MAX];
+    char command[PATH_MAX];
+    char output[PATH_MAX];
     struct stat buf;
-    char datapath[PATH_MAX];
-    char new_datapath[PATH_MAX];
-    char metapath[PATH_MAX];
-    char new_metapath[PATH_MAX];
+    char path[PATH_MAX];
+    char new_path[PATH_MAX];
     int ret = 0;
     
-    memset(datapath, 0, sizeof(datapath));
-    memset(metapath, 0, sizeof(metapath));
-    sprintf(datapath, "%s%s", opts.data_storage_path, opts.old_fsid_hex);
-    sprintf(metapath, "%s/%s", opts.meta_storage_path, opts.old_fsid_hex);
-
-    /* See if each directory exists */
-    ret = stat(datapath, &buf);
+    memset(path,0,sizeof(path));
+    sprintf(path,"%s/%s", opts.storage_path, opts.old_fsid_hex);
+
+    /* See if directory exists */
+    ret = stat(path, &buf);
     if(ret)
     {
         fprintf(stderr,
-                "Error checking for data directory's existance. [%s]\n",
-                datapath);
-        return -1;
-    }
-    ret = stat(metapath, &buf);
-    if(ret)
-    {
-        fprintf(stderr,
-                "Error checking for meta directory's existance. [%s]\n",
-                metapath);
+                "Error checking for directory's existance. [%s]\n",
+                path);
         return -1;
     }
@@ -356 +341 @@
     }
     
-        memset(datacommand, 0, sizeof(datacommand));
-        memset(metacommand, 0, sizeof(metacommand));
-        memset(dataoutput, 0, sizeof(dataoutput));
-        memset(metaoutput, 0, sizeof(metaoutput));
-        memset(new_datapath, 0, sizeof(new_datapath));
-    memset(new_metapath, 0, sizeof(new_metapath));
-
-    /* Move the directories */
-        sprintf(new_datapath, "%s/%s", opts.data_storage_path, opts.new_fsid_hex);
-        sprintf(new_metapath, "%s%s", opts.meta_storage_path, opts.new_fsid_hex);
-        sprintf(datacommand, "mv %s %s", datapath, new_datapath);
-        sprintf(metacommand, "mv %s %s", metapath, new_metapath);
-
-        /* move the data dir */
-    fptr = popen(datacommand, "r");
+    memset(command,0,sizeof(command));
+    memset(output,0,sizeof(output));
+    memset(new_path,0,sizeof(new_path));
+
+    /* Move the directory */
+    sprintf(new_path, "%s/%s", opts.storage_path, opts.new_fsid_hex);
+    sprintf(command, "mv %s %s", path, new_path);
+
+    fptr = popen(command, "r");
     if(fptr == NULL)
     {
@@ -376 +355 @@
         exit(-1);
     }
-    ret = fscanf(fptr, "%s", dataoutput);
-    if(ret && strncmp(dataoutput,"",PATH_MAX))
-    {
-        printf("mv from [%s] to [%s] failed.\n", datapath, new_datapath);
+    ret = fscanf(fptr, "%s", output);
+    if(ret && strncmp(output,"",PATH_MAX))
+    {
+        printf("mv from [%s] to [%s] failed.\n", path, new_path);
         return -1;
     }
     pclose(fptr);
 
-        /* move the meta dir */
-        fptr = popen(metacommand, "r");
-    if(fptr == NULL)
-    {
-        fprintf(stderr,"Error opening pipe. errno=%d",errno);
-        exit(-1);
-    }
-    ret = fscanf(fptr, "%s", metaoutput);
-    if(ret && strncmp(metaoutput,"",PATH_MAX))
-    {
-        printf("mv from [%s] to [%s] failed.\n", metapath, new_metapath);
-        return -1;
-    }
-    pclose(fptr);
-
     if(opts.verbose)
     {
-        printf("Successful data dir move from [%s] to [%s]\n", datapath, new_datapath);
-                printf("Successful meta dir move from [%s] to [%s]\n", metapath, new_metapath);
+        printf("Successful dir move from [%s] to [%s]\n", path, new_path);
     }
 
@@ -554 +517 @@
         {"dbpath",1,0,0},
         {"fsconf",1,0,0},
-        {"datastorage",1,0,0},
-        {"metastorage",1,0,0},
+        {"storage",1,0,0},
         {"view",0,0,0},
         {0,0,0,0}
@@ -600 +562 @@
                 break;
 
-            case 7: /* data storage */
-                strncpy(opts.data_storage_path, optarg, PATH_MAX);
-                break;
-
-                case 8: /* meta storage */
-                                strncpy(opts.meta_storage_path, optarg, PATH_MAX);
-                                break;
-
-            case 9: /* view */
+            case 7: /* storage */
+                strncpy(opts.storage_path, optarg, PATH_MAX);
+                break;
+
+            case 8: /* view */
                 opts.view_only = 1;
                 break;
@@ -635 +593 @@
     }
 
-    /* data storage_path must be set */
-    if(!strncmp(opts.data_storage_path,"",PATH_MAX))
-    {
-        fprintf(stderr,"Error: --datastorage option must be given.\n");
-        print_help(argv[0]);
-        return(-1);
-    }
-
-    /* meta storage_path must be set */
-    if(!strncmp(opts.meta_storage_path,"",PATH_MAX))
-    {
-        fprintf(stderr,"Error: --metastorage option must be given.\n");
+    /* storage_path must be set */
+    if(!strncmp(opts.storage_path,"",PATH_MAX))
+    {
+        fprintf(stderr,"Error: --storage option must be given.\n");
         print_help(argv[0]);
         return(-1);
@@ -663 +613 @@
     fprintf(stderr,"  --fsconf=</path/to/pvfs2-fs.conf>     "
             "Fs config file for the the file system being modified.\n");
-    fprintf(stderr,"  --datastorage=</path/to/pvfs2-data-storage-space>     "
-            "Local data storage space for the the file system being modified.\n");
-    fprintf(stderr,"  --metastorage=</path/to/pvfs2-meta-storage-space>     "
-            "Local meta storage space for the the file system being modified.\n");
+    fprintf(stderr,"  --storage=</path/to/pvfs2-storage-space>     "
+            "Local storage space for the the file system being modified.\n");
     fprintf(stderr, "\n");
     fprintf(stderr,"The following arguments are optional:\n");

trunk/src/apps/admin/pvfs2-genconfig

@@ -57 +57 @@
 
 my $default_storage = undef;
-my $default_meta_storage = undef;
 my $default_logfile = undef;
 
@@ -217 +216 @@
     if(defined($default_storage))
     {
-        print $target "\n\tDataStorageSpace " . $default_storage . "\n";
-    }
-
-    if(defined($default_meta_storage))
-    {
-        print $target "\tMetadataStorageSpace " . $default_meta_storage . "\n\n";
+        print $target "\n\tStorageSpace " . $default_storage . "\n";
     }
 
@@ -386 +380 @@
         print $target "\n<ServerOptions>\n";
         print $target "\tServer $alias\n";
-        print $target "\tDataStorageSpace $endpoint->{STORAGE}\n";
-        print $target "\tMetadataStorageSpace $endpoint->{METASTORAGE}\n";
+        print $target "\tStorageSpace $endpoint->{STORAGE}\n";
         print $target "\tLogFile $endpoint->{LOGFILE}\n";
         print $target "</ServerOptions>\n";
@@ -396 +389 @@
 sub emit_server_conf
 {
-    my($target, $node, $storage, $metastorage, $logfile) = @_;
-
-    print $target "DataStorageSpace $storage\n";
-    print $target "MetadataStorageSpace $metastorage\n";
+    my($target, $node, $storage, $logfile) = @_;
+
+    print $target "StorageSpace $storage\n";
     print $target "HostID \"" . get_bmi_endpoint($node) . "\"\n";
     print $target "LogFile $logfile\n";
@@ -850 +842 @@
 }
 
-sub get_meta_storage
-{
-    my $metastorage = "/pvfs2-storage-space";
-    if ($opt_storage) {
-        $metastorage = $opt_storage;
-    } elsif (!$opt_quiet) {
-            print $OUT "Choose a directory for each server to store metadata in.\n";
-            $metastorage = prompt_word("Enter directory name: [Default is /pvfs2-storage-space]: ","/pvfs2-storage-space");
-    }
-    return $metastorage;
-}
+
 
 # get host port
@@ -966 +948 @@
     my $portmap = shift;
     my $storage = shift;
-    my $metastorage = shift;
     my $logfile = shift;
     my $ioline = '';
@@ -996 +977 @@
                 HOSTNAME => $io_host, 
                 PORTMAP => $portmap, 
-                STORAGE => $storage,
-                METASTORAGE => $metastorage, 
+                STORAGE => $storage, 
                 LOGFILE => $logfile};
         }
@@ -1007 +987 @@
     my $portmap = shift;
     my $storage = shift;
-    my $metastorage = shift;
     my $logfile = shift;
     my $metaline = '';
@@ -1053 +1032 @@
                 HOSTNAME => $meta_host, 
                 PORTMAP => $portmap, 
-                STORAGE => $storage,
-                METASTORAGE => $metastorage, 
+                STORAGE => $storage, 
                 LOGFILE => $logfile};
         }
@@ -1083 +1061 @@
     {
         my $stor = undef;
-        my $mstor = undef;
         my $logf = undef;
         my $proto = undef;
@@ -1094 +1071 @@
             # endpoint.  We want to match on [...]:storage:logfile
             # and place the stuff between the [] in $1, and optionally
-            # place the matched storage path and meta path in $2 and $3,
-            # logfile is in $4
+            # place the matched storage path and logfile in $2 and $3 
             #
             $ep =~ /\[([^\]]+)\](?::([^:]+))?(?::([^:]+))?/;
 
             $stor = $2;
-            $mstor = $3;
-            $logf = $4;
+            $logf = $3;
 
             if(!defined($1))
@@ -1152 +1127 @@
                 HOSTNAME => $hostname, 
                 PORTMAP => \%port, 
-                STORAGE => $stor,
-                METASTORAGE => $mstor, 
+                STORAGE => $stor, 
                 LOGFILE => $logf};
         }
@@ -1200 +1174 @@
             my $pranges = $4;
             $stor = $5;
-            $mstor = $6;
-            $logf = $7;
+            $logf = $6;
 
             if($proto !~ /mx/)
             {
                 $logf = $stor;
-                $stor = $mstor;
-                $mstor = $pranges;
+                $stor = $pranges;
                 $pranges = $branges;
                 $branges = undef;
@@ -1249 +1221 @@
                                 PORTMAP => $portmap, 
                                 STORAGE => $stor, 
-                                METASTORAGE => $mstor,
                                 LOGFILE => $logf};
                         }
@@ -1271 +1242 @@
                                     PORTMAP => $portmap,
                                     STORAGE => $stor,
-                                    METASTORAGE => $mstor,
                                     LOGFILE => $logf};
                             }
@@ -1310 +1280 @@
                                         PORTMAP => $portmap,
                                         STORAGE => $stor,
-                                        METASTORAGE => $mstor,
                                         LOGFILE => $logf};
                                 }
@@ -1527 +1496 @@
 
     $default_storage = get_storage();
-    $default_meta_storage = get_meta_storage();
     $default_logfile = get_logfile();
 
     get_ionames($portmap, $default_storage, $default_logfile);
-    get_metanames($portmap, $default_meta_storage, $default_logfile);
+    get_metanames($portmap, $default_storage, $default_logfile);
 }
 
@@ -1545 +1513 @@
     set_default_value(STORAGE, $default_storage);
     set_default_value(STORAGE, $default_storage);
-}
-
-if(needs_default_value(METASTORAGE))
-{
-    if(!defined($default_meta_storage))
-    {
-        $default_meta_storage = get_meta_storage();
-    }
-    set_default_value(METASTORAGE, $default_meta_storage);
-    set_default_value(METASTORAGE, $default_meta_storage);
 }
 

trunk/src/apps/admin/pvfs2-migrate-collection.c

@@ -63 +63 @@
 static int parse_args(int argc, char **argv, options_t *opts);
 static int src_get_version(
-    char* meta_storage_space, TROVE_coll_id coll_id, char* coll_name,
+    char* storage_space, TROVE_coll_id coll_id, char* coll_name,
     char* ver_string, int ver_string_max);
-static int remove_collection_entry(char* meta_storage_space, char* collname);
+static int remove_collection_entry(char* storage_space, char* collname);
 
 int migrate_collection(void * config, void * sconfig);
@@ -73 +73 @@
 /* functions specific to reading 0.0.1 collections */
 static int src_get_version_0_0_1(
-    char* meta_storage_space, TROVE_coll_id coll_id, 
+    char* storage_space, TROVE_coll_id coll_id, 
     char* ver_string, int ver_string_max);
 static int translate_0_0_1(
-    char* data_storage_space, char* meta_storage_space, char* old_coll_path, 
+    char* storage_space, char* old_coll_path, 
     char* coll_name, TROVE_coll_id coll_id);
 static int translate_coll_eattr_0_0_1(
@@ -88 +88 @@
     TROVE_context_id trove_context);
 static int translate_bstreams_0_0_1(
-    char* data_storage_space, char* old_coll_path, 
+    char* storage_space, char* old_coll_path, 
     TROVE_coll_id coll_id, char* coll_name,
     TROVE_context_id trove_context);
@@ -233 +233 @@
         (struct server_configuration_s *) sconfig;
 
-    if(server_config->meta_path == NULL)
-    {
-        server_config->meta_path = server_config->data_path;
-    }
-
     memset(version, 0, 256);
     /* find version of source storage space */
     ret = src_get_version(
-        server_config->meta_path, 
+        server_config->storage_path, 
         fs_config->coll_id, 
         fs_config->file_system_name,
@@ -258 +253 @@
     {
         sprintf(old_coll_path, "%s/%08x-old-%s",
-                server_config->meta_path, 
+                server_config->storage_path, 
                 fs_config->coll_id, version);
 
@@ -297 +292 @@
 
         ret = translate_0_0_1(
-            server_config->data_path, 
-            server_config->meta_path,
-            old_coll_path, 
+            server_config->storage_path, old_coll_path, 
             fs_config->file_system_name, 
             fs_config->coll_id);
@@ -334 +327 @@
              * is anymore
              */
-            DIR * data_storage_dir;
-            DIR * meta_storage_dir;
+            DIR * storage_dir;
             struct dirent * next_dirent;
             char collname[PATH_MAX];
@@ -343 +335 @@
             collname_length = sprintf(collname, "%08x-old", fs_config->coll_id);
 
-            data_storage_dir = opendir(server_config->data_path);
-            if(!data_storage_dir)
-            {
-                fprintf(stderr, "Error: failed to open data directory: %s\n",
-                        server_config->data_path);
+            storage_dir = opendir(server_config->storage_path);
+            if(!storage_dir)
+            {
+                fprintf(stderr, "Error: failed to open directory: %s\n",
+                        server_config->storage_path);
                 return -1;
             }
 
-            while((next_dirent = readdir(data_storage_dir)) != NULL)
+            while((next_dirent = readdir(storage_dir)) != NULL)
             {
                 int d_namelen = strlen(next_dirent->d_name);
@@ -360 +352 @@
 
                     sprintf(old_coll_path, "%s/%s",
-                            server_config->data_path, next_dirent->d_name);
+                            server_config->storage_path, next_dirent->d_name);
 
                     /* found an old version, delete it */
@@ -373 +365 @@
                             "Error: failed to remove old collection at: %s\n",
                             old_coll_path);
-                        closedir(data_storage_dir);
+                        closedir(storage_dir);
                         return -1;
                     }
@@ -380 +372 @@
             }
 
-            /* if the meta and data paths are the same, don't try to remove twice */
-            if (strcmp(server_config->data_path, server_config->meta_path))
-            {
-                meta_storage_dir = opendir(server_config->meta_path);
-                if(!meta_storage_dir)
-                {
-                    fprintf(stderr, "Error: failed to open meta directory: %s\n",
-                        server_config->meta_path);
-                    return -1;
-                }
-
-                while((next_dirent = readdir(meta_storage_dir)) != NULL)
-                {
-                    int d_namelen = strlen(next_dirent->d_name);
-                    if(collname_length < d_namelen &&
-                       strncmp(next_dirent->d_name, collname, collname_length) == 0)
-                    { 
-                        char old_coll_path[PATH_MAX];
-
-                        sprintf(old_coll_path, "%s/%s",
-                                server_config->meta_path, next_dirent->d_name);
-
-                         /* found an old version, delete it */
-                        if(verbose) 
-                            printf("VERBOSE Removing old collection at: %s\n",
-                                   old_coll_path);
-                        ret = recursive_rmdir(old_coll_path);
-                        if(ret < 0)
-                        {
-                            fprintf(
-                                stderr, 
-                                "Error: failed to remove old collection at: %s\n",
-                                old_coll_path);
-                            closedir(meta_storage_dir);
-                            return -1;
-                        }
-                        removed_olddirs = 1;
-                    }
-                }
-                closedir(meta_storage_dir);
-            }
-
             if(removed_olddirs == 0)
             {
@@ -429 +379 @@
             }
 
-            closedir(data_storage_dir);
+            closedir(storage_dir);
         }
         else
@@ -576 +526 @@
  */
 static int src_get_version(
-    char* meta_storage_space,       /**< path to storage space */
+    char* storage_space,       /**< path to storage space */
     TROVE_coll_id coll_id,     /**< collection id */
     char* coll_name,           /**< collection name */
@@ -586 +536 @@
 
     ret = src_get_version_0_0_1(
-        meta_storage_space, coll_id, ver_string, ver_string_max);
+        storage_space, coll_id, ver_string, ver_string_max);
 
     if(ret != 0)
@@ -593 +543 @@
                 "Error: all known collection version checks "
                 "failed for \ncollection %s (%08x) in storage space %s\n", 
-                coll_name, coll_id, meta_storage_space);
+                coll_name, coll_id, storage_space);
     }
 
@@ -605 +555 @@
  */
 static int src_get_version_0_0_1(
-    char* meta_storage_space,   /**< path to storage space */
+    char* storage_space,   /**< path to storage space */
     TROVE_coll_id coll_id, /**< collection id */
     char* ver_string,      /**< version in string format */
@@ -616 +566 @@
 
     sprintf(coll_db, "%s/%08x/collection_attributes.db", 
-            meta_storage_space, coll_id);
+            storage_space, coll_id);
 
     /* try to find a collections db */
@@ -679 +629 @@
  */
 static int translate_0_0_1(
-    char* data_storage_space,   /**< path to data storage space */
-    char* meta_storage_space, /**< path to metadata storage space */
+    char* storage_space,   /**< path to storage space */
     char* old_coll_path,   /**< path to old collection */
     char* coll_name,       /**< collection name */
@@ -695 +644 @@
 
     /* rename old collection */
-    snprintf(current_path, PATH_MAX, "%s/%08x", meta_storage_space, coll_id);
+    snprintf(current_path, PATH_MAX, "%s/%08x", storage_space, coll_id);
 
     if(access(current_path, F_OK) != 0)
@@ -714 +663 @@
     }
 
-    ret = remove_collection_entry(meta_storage_space, coll_name);
+    ret = remove_collection_entry(storage_space, coll_name);
     if(ret < 0)
     {
@@ -729 +678 @@
         printf("VERBOSE Creating temporary collection to migrate to.\n");
     ret = pvfs2_mkspace(
-        data_storage_space,
-        meta_storage_space,
+        storage_space, 
         coll_name,
         coll_id, 
@@ -751 +699 @@
         PVFS_perror("PINT_dist_initialize", ret);
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -757 +705 @@
     /* initialize trove and lookup collection */
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, data_storage_space, meta_storage_space,0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0)
     {
         PVFS_perror("trove_initialize", ret);
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -771 +719 @@
         fprintf(stderr, "Error: failed to lookup new collection.\n");
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
         return -1; 
     }   
@@ -789 +737 @@
         fprintf(stderr, "Error: failed to migrate collection extended attributes.\n");
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -800 +748 @@
         fprintf(stderr, "Error: failed to migrate dspace attributes.\n");
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -811 +759 @@
         fprintf(stderr, "Error: failed to migrate keyvals.\n");
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -822 +770 @@
     /* convert bstreams */
     ret = translate_bstreams_0_0_1(
-        data_storage_space, old_coll_path, coll_id, coll_name, trove_context);
+        storage_space, old_coll_path, coll_id, coll_name, trove_context);
     if(ret < 0)
     {
         fprintf(stderr, "Error: failed to migrate bstreams.\n");
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -846 +794 @@
 }
 
-static int remove_collection_entry(char* meta_storage_space, char* collname)
+static int remove_collection_entry(char* storage_space, char* collname)
 {
     char collections_db[PATH_MAX];
@@ -854 +802 @@
     TROVE_coll_id coll_id;
 
-    sprintf(collections_db, "%s/collections.db", meta_storage_space);
+    sprintf(collections_db, "%s/collections.db", storage_space);
 
     ret = access(collections_db, F_OK);
@@ -1545 +1493 @@
  */
 static int translate_bstreams_0_0_1(
-    char* data_storage_space,            /**< path to trove storage space */
+    char* storage_space,            /**< path to trove storage space */
     char* old_coll_path,            /**< path to old collection */
     TROVE_coll_id coll_id,          /**< collection id */
@@ -1582 +1530 @@
                     old_coll_path, i, tmp_ent->d_name);
                 snprintf(new_bstream_file, PATH_MAX, "%s/%08x/bstreams/%.8d/%s",
-                    data_storage_space, coll_id, i, tmp_ent->d_name);
+                    storage_space, coll_id, i, tmp_ent->d_name);
                 /* hard link to new location */
                 ret = link(bstream_file, new_bstream_file);

trunk/src/apps/admin/pvfs2-mkspace.c

@@ -32 +32 @@
     char data_ranges[PATH_MAX];
     char collection[PATH_MAX];
-    char data_space[PATH_MAX];
-    char meta_space[PATH_MAX];
+    char storage_space[PATH_MAX];
 } options_t;
 
@@ -55 +54 @@
         {"verbose",0,0,0},
         {"defaults",0,0,0},
-        {"data-space",1,0,0},
-        {"meta-space",1,0,0},
+        {"storage-space",1,0,0},
         {"coll-id",1,0,0},
         {"coll-name",1,0,0},
@@ -73 +71 @@
     }
 
-    while ((ret = getopt_long(argc, argv, "c:i:r:vVhadDM:N:",
+    while ((ret = getopt_long(argc, argv, "s:c:i:r:vVhadDM:N:",
                               long_opts, &option_index)) != -1)
     {
@@ -93 +91 @@
                     goto do_verbose;
                 }
-                else if (strcmp("data-space", cur_option) == 0)
-                {
-                    strncpy(opts->data_space, optarg, PATH_MAX);
-                }
-                                else if (strcmp("meta-space", cur_option) == 0)
-                                {
-                                strncpy(opts->meta_space, optarg, PATH_MAX);
-                                }
+                else if (strcmp("storage-space", cur_option) == 0)
+                {
+                    goto do_storage_space;
+                }
                 else if (strcmp("coll-id", cur_option) == 0)
                 {
@@ -179 +173 @@
           do_data_handle_range:
                 strncpy(opts->data_ranges, optarg, PATH_MAX);
+                break;
+            case 's':
+          do_storage_space:
+                strncpy(opts->storage_space, optarg, PATH_MAX);
                 break;
             case 'v':
@@ -226 +224 @@
                (strlen(opts->data_ranges) ?
                 opts->data_ranges : "None specified"));
-        printf("\tdata storage space       : %s\n",
-               (strlen(opts->data_space) ?
-                opts->data_space : "None specified"));
-                printf("metadata storage space : %s\n",
-                        (strlen(opts->meta_space) ?
-                opts->meta_space : "None specified"));
+        printf("\tstorage space       : %s\n",
+               (strlen(opts->storage_space) ?
+                opts->storage_space : "None specified"));
     }
 }
@@ -264 +259 @@
             "create collection with the specified\n        "
             "                                data handle range\n");
-    fprintf(stderr,"       --data-space=PATH             "
-            "create data storage space at this location\n");
-    fprintf(stderr,"       --meta-space=PATH             "
-            "create metadata storage space at this location\n");
+    fprintf(stderr,"  -s, --storage-space=PATH             "
+            "create storage space at this location\n");
     fprintf(stderr,"  -v, --verbose                        "
             "operate in verbose mode\n");
@@ -304 +297 @@
     print_options(&opts);
 
-    if (strlen(opts.data_space) == 0)
-    {
-        fprintf(stderr, "Error: You MUST specify a data storage space\n");
-        return -1;
-    }
-
-    if (strlen(opts.meta_space) == 0)
-    {
-        fprintf(stderr, "Error: You MUST specify a metadata storage space\n");
+    if (strlen(opts.storage_space) == 0)
+    {
+        fprintf(stderr, "Error: You MUST specify a storage space\n");
         return -1;
     }
@@ -332 +319 @@
     if (opts.delete_storage)
     {
-        ret = pvfs2_rmspace(opts.data_space, opts.meta_space,
-                            opts.collection, opts.coll_id, 
-                            opts.collection_only, opts.verbose);
+        ret = pvfs2_rmspace(opts.storage_space, opts.collection,
+                            opts.coll_id, opts.collection_only,
+                            opts.verbose);
     }
     else
     {
-        ret = pvfs2_mkspace(opts.data_space, opts.meta_space,
-                            opts.collection, opts.coll_id, 
-                            opts.root_handle, opts.meta_ranges, 
-                            opts.data_ranges, opts.collection_only, 
-                            opts.verbose);
+        ret = pvfs2_mkspace(opts.storage_space, opts.collection,
+                            opts.coll_id, opts.root_handle,
+                            opts.meta_ranges, opts.data_ranges,
+                            opts.collection_only, opts.verbose);
     }
     return ret;

trunk/src/apps/admin/pvfs2-showcoll.c

@@ -24 +24 @@
 size_t strnlen(const char *s, size_t limit);
 
-static char data_path[PATH_MAX] = "/tmp/pvfs2-test-space";
-static char meta_path[PATH_MAX] = "/tmp/pvfs2-test-space";
+static char storage_space[PATH_MAX] = "/tmp/pvfs2-test-space";
 static char collection[PATH_MAX];
 static int verbose = 0, got_collection = 0, print_keyvals = 0, got_dspace_handle = 0;
@@ -73 +72 @@
     /* initialize trove, verifying storage space exists */
     ret = trove_initialize(
-      TROVE_METHOD_DBPF, NULL, data_path, meta_path, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) 
     {
@@ -83 +82 @@
 
     if (verbose) fprintf(stderr,
-                         "%s: info: initialized with storage spaces '%s' and '%s'.\n",
+                         "%s: info: initialized with storage space '%s'.\n",
                          argv[0],
-                         data_path, meta_path);
+                         storage_space);
 
     /* if no collection was specified, simply print out the collections and exit */
@@ -166 +165 @@
     if (no_root_handle) {
         fprintf(stdout,
-                "Storage space %s and %s, collection %s (coll_id = %d, "
+                "Storage space %s, collection %s (coll_id = %d, "
                 "*** no root_handle found ***):\n",
-                data_path,
-                meta_path,
+                storage_space,
                 collection,
                 coll_id);
@@ -175 +173 @@
     else {
         fprintf(stdout,
-                "Storage space %s and %s, collection %s (coll_id = %d, "
+                "Storage space %s, collection %s (coll_id = %d, "
                 "root_handle = 0x%08llx):\n",
-                data_path,
-                meta_path,
+                storage_space,
                 collection,
                 coll_id,
@@ -204 +201 @@
     int c;
 
-    while ((c = getopt(argc, argv, "s:m:c:d:kvh")) != EOF) {
+    while ((c = getopt(argc, argv, "s:c:d:kvh")) != EOF) {
         switch (c) {
             case 's':
-                strncpy(data_path, optarg, PATH_MAX);
+                strncpy(storage_space, optarg, PATH_MAX);
                 break;
-            case 'm':
-                strncpy(meta_path, optarg, PATH_MAX);
             case 'c': /* collection */
                 got_collection = 1;
@@ -230 +225 @@
             case 'h':
                 fprintf(stderr,
-                        "usage: pvfs2-showcoll [-s data_storage_space] [-m metadata storage space] [-c collection_name] [-d dspace_handle] [-v] [-k] [-h]\n");
+                        "usage: pvfs2-showcoll [-s storage_space] [-c collection_name] [-d dspace_handle] [-v] [-k] [-h]\n");
                 fprintf(stderr, "\tdefault storage space is '/tmp/pvfs2-test-space'.\n");
                 fprintf(stderr, "\t'-v' turns on verbose output.\n");
@@ -504 +499 @@
     pos = TROVE_ITERATE_START;
 
-    fprintf(stdout, "Storage space %s and %s collections:\n",
-            data_path, meta_path);
+    fprintf(stdout, "Storage space %s collections:\n", storage_space);
 
     while (count > 0) {

trunk/src/common/misc/mkspace.c

@@ -112 +112 @@
 
 int pvfs2_mkspace(
-    char *data_path,
-    char *meta_path,
+    char *storage_space,
     char *collection,
     TROVE_coll_id coll_id,
@@ -136 +135 @@
     TROVE_handle lost_and_found_dirdata_handle = TROVE_HANDLE_NULL;
 
-    mkspace_print(verbose,"Data storage space     : %s\n",data_path);
-    mkspace_print(verbose,"Metadata storage space : %s\n", meta_path);
+    mkspace_print(verbose,"Storage space: %s\n",storage_space);
     mkspace_print(verbose,"Collection   : %s\n",collection);
     mkspace_print(verbose,"ID           : %d\n",coll_id);
@@ -162 +160 @@
         ret = trove_initialize(TROVE_METHOD_DBPF, 
                                NULL, 
-                               data_path,
-                               meta_path,
+                               storage_space, 
                                0);
         if (ret > -1)
         {
-            gossip_err("error: storage space %s or %s already "
-                       "exists; aborting!\n",data_path,meta_path);
-            return -1;
-        }
-
-        ret = trove_storage_create(TROVE_METHOD_DBPF, data_path, meta_path, NULL, &op_id);
+            gossip_err("error: storage space %s already "
+                       "exists; aborting!\n",storage_space);
+            return -1;
+        }
+
+        ret = trove_storage_create(TROVE_METHOD_DBPF, storage_space, NULL, &op_id);
         if (ret != 1)
         {
@@ -183 +180 @@
     ret = trove_initialize(
         TROVE_METHOD_DBPF, NULL, 
-        data_path, meta_path, 0);
+        storage_space, 0);
     if (ret < 0)
     {
@@ -190 +187 @@
     }
 
-    mkspace_print(verbose,"info: created data storage space '%s'.\n",
-                  data_path);
-    mkspace_print(verbose,"info: created metadata storage space '%s'.\n",
-                  meta_path);
+    mkspace_print(verbose,"info: created storage space '%s'.\n",
+                  storage_space);
 
     /* try to look up collection used to store file system */
@@ -642 +637 @@
 
 int pvfs2_rmspace(
-    char *data_path,
-    char *meta_path,
+    char *storage_space,
     char *collection,
     TROVE_coll_id coll_id,
@@ -658 +652 @@
         ret = trove_initialize(
             TROVE_METHOD_DBPF, NULL,
-            data_path, meta_path, 0);
+            storage_space, 0);
         if (ret == -1)
         {
-            gossip_err("error: storage space %s or %s does not "
-                       "exist; aborting!\n", data_path, meta_path);
+            gossip_err("error: storage space %s does not "
+                       "exist; aborting!\n", storage_space);
             return -1;
         }
@@ -680 +674 @@
     if (!remove_collection_only)
     {
-        ret = trove_storage_remove(TROVE_METHOD_DBPF, data_path, meta_path, 
-                                   NULL, &op_id);
+        ret = trove_storage_remove(
+            TROVE_METHOD_DBPF, storage_space, NULL, &op_id);
         /*
          * it is a bit weird to do a trove_finaliz() prior to blowing away
@@ -689 +683 @@
         trove_finalize(TROVE_METHOD_DBPF);
         mkspace_print(
-            verbose, "PVFS2 Storage Space %s and %s removed %s\n",
-            data_path, meta_path, (((ret == 1) || (ret == -TROVE_ENOENT)) ?
+            verbose, "PVFS2 Storage Space %s removed %s\n",
+            storage_space, (((ret == 1) || (ret == -TROVE_ENOENT)) ?
                             "successfully" : "with errors"));
 

trunk/src/common/misc/mkspace.h

@@ -14 +14 @@
 
 int pvfs2_mkspace(
-    char *data_path,
-    char *meta_path,
+    char *storage_space,
     char *collection,
     TROVE_coll_id coll_id,
@@ -25 +24 @@
 
 int pvfs2_rmspace(
-    char *data_path,
-    char *meta_path,
+    char *storage_space,
     char *collection,
     TROVE_coll_id coll_id,

trunk/src/common/misc/server-config.c

@@ -35 +35 @@
 
 static DOTCONF_CB(get_logstamp);
-static DOTCONF_CB(get_data_path);
-static DOTCONF_CB(get_meta_path);
+static DOTCONF_CB(get_storage_space);
 static DOTCONF_CB(enter_defaults_context);
 static DOTCONF_CB(exit_defaults_context);
@@ -552 +551 @@
          CTX_DEFAULTS|CTX_SERVER_OPTIONS,"50"},
 
-    /* Specifies the local path for the pvfs2 server to use as storage space 
-     * for data files. This option specifies the default path for all servers 
-     * and will appear in the Defaults context.
+    /* Specifies the local path for the pvfs2 server to use as storage space.
+     * This option specifies the default path for all servers and will appear
+     * in the Defaults context.
      *
      * NOTE: This can be overridden in the <ServerOptions> tag on a per-server
@@ -560 +559 @@
      * Example:
      *
-     * DataStorageSpace /tmp/pvfs-data.storage
-     */
-    {"DataStorageSpace",ARG_STR, get_data_path,NULL,
-        CTX_DEFAULTS|CTX_SERVER_OPTIONS,NULL},
-
-    /* Specifies the local path for the pvfs2 server to use as storage space 
-     * for metadata files. This option specifies the default path for all 
-     * servers and will appear in the Defaults context.
-     *
-     * NOTE: This can be overridden in the <ServerOptions> tag on a per-server
-     * basis. Look at the "Option" tag for more details
-     * Example:
-     *
-     * MetadataStorageSpace /tmp/pvfs-meta.storage
-     */
-    {"MetadataStorageSpace",ARG_STR, get_meta_path,NULL,
+     * StorageSpace /tmp/pvfs.storage
+     */
+    {"StorageSpace",ARG_STR, get_storage_space,NULL,
         CTX_DEFAULTS|CTX_SERVER_OPTIONS,NULL},
 
@@ -1063 +1049 @@
     }
 
-    if (server_alias_name && !config_s->data_path)
+    if (server_alias_name && !config_s->storage_path)
     {
         gossip_err("Configuration file error. "
-                   "No data storage path specified for alias %s.\n", server_alias_name);
-        return 1;
-    }
-
-    if (server_alias_name && !config_s->meta_path)
-    {
-        gossip_err("Configuration file error. "
-                   "No metadata storage path specified for alias %s.\n", server_alias_name);
+                   "No storage path specified for alias %s.\n", server_alias_name);
         return 1;
     }
@@ -1157 +1136 @@
 
 
-DOTCONF_CB(get_data_path)
+DOTCONF_CB(get_storage_space)
 {
     struct server_configuration_s *config_s = 
@@ -1166 +1145 @@
         return NULL;
     }
-    if (config_s->data_path)
-    {
-        free(config_s->data_path);
-    }
-    config_s->data_path =
-        (cmd->data.str ? strdup(cmd->data.str) : NULL);
-    return NULL;
-}
-
-DOTCONF_CB(get_meta_path)
-{
-    struct server_configuration_s *config_s = 
-        (struct server_configuration_s *)cmd->context;
-    if(config_s->configuration_context == CTX_SERVER_OPTIONS &&
-       config_s->my_server_options == 0)
-    {
-        return NULL;
-    }
-    if (config_s->meta_path)
-    {
-        free(config_s->meta_path);
-    }
-    config_s->meta_path =
+    if (config_s->storage_path)
+    {
+        free(config_s->storage_path);
+    }
+    config_s->storage_path =
         (cmd->data.str ? strdup(cmd->data.str) : NULL);
     return NULL;
@@ -2877 +2838 @@
         }
 
-        if (config_s->data_path)
-        {
-            free(config_s->data_path);
-            config_s->data_path = NULL;
-        }
-
-        if (config_s->meta_path)
-        {
-            free(config_s->meta_path);
-            config_s->meta_path = NULL;
+        if (config_s->storage_path)
+        {
+            free(config_s->storage_path);
+            config_s->storage_path = NULL;
         }
 
@@ -4386 +4341 @@
 
             ret = pvfs2_mkspace(
-                config->data_path, config->meta_path, cur_fs->file_system_name,
+                config->storage_path, cur_fs->file_system_name,
                 cur_fs->coll_id, root_handle, cur_meta_handle_range,
                 cur_data_handle_range, create_collection_only, 1);
@@ -4441 +4396 @@
                 (remove_collection_only ? "collection" :
                  "storage space"));
-            ret = pvfs2_rmspace(config->data_path,
-                                config->meta_path,
+            ret = pvfs2_rmspace(config->storage_path,
                                 cur_fs->file_system_name,
                                 cur_fs->coll_id,

trunk/src/common/misc/server-config.h

@@ -146 +146 @@
     char *server_alias;             /* the command line server-alias parameter */
     int my_server_options;
-    char *data_path;                /* path to data storage directory */
-    char *meta_path;                /* path to metadata storage directory */
+    char *storage_path;
     char *fs_config_filename;       /* the fs.conf file name            */
     size_t fs_config_buflen;        /* the fs.conf file length          */

trunk/src/io/trove/trove-dbpf/dbpf-dspace.c

@@ -2116 +2116 @@
      * somehow
      */
-    DBPF_GET_BSTREAM_FILENAME(filename, PATH_MAX, my_storage_p->data_path,
+    DBPF_GET_BSTREAM_FILENAME(filename, PATH_MAX, my_storage_p->name,
                               coll_p->coll_id, llu(new_handle));
     ret = access(filename, F_OK);
@@ -2129 +2129 @@
         
         DBPF_GET_STRANDED_BSTREAM_FILENAME(new_filename, PATH_MAX,
-                                           my_storage_p->data_path, 
+                                           my_storage_p->name, 
                                            coll_p->coll_id,
                                            llu(new_handle));

trunk/src/io/trove/trove-dbpf/dbpf-mgmt.c

@@ -292 +292 @@
 }
 
-static int dbpf_db_create(char *dbname, 
+static int dbpf_db_create(const char *sto_path, 
+                          char *dbname, 
                           DB_ENV *envp, 
                           uint32_t flags);
 static DB *dbpf_db_open(
-    char *dbname, DB_ENV *envp, int *err_p,
+    const char *sto_path, char *dbname, DB_ENV *envp, int *err_p,
     int (*compare_fn) (DB *db, const DBT *dbt1, const DBT *dbt2), uint32_t flags);
 static int dbpf_mkpath(char *pathname, mode_t mode);
@@ -329 +330 @@
                 TROVE_statfs *tmp_trove_statfs = (TROVE_statfs *)parameter;
 
-                /* XXX: this is not entirely accurate when data and metadata
-                                * are stored on different devices.
-                                */
-                DBPF_GET_DATA_DIRNAME(path_name, PATH_MAX, sto_p->data_path);
+                DBPF_GET_STORAGE_DIRNAME(path_name, PATH_MAX, sto_p->name);
                 ret = PINT_statfs_lookup(path_name, &tmp_statfs);
                 if (ret < 0)
@@ -572 +570 @@
 }
 
-static int dbpf_initialize(char *data_path,
-                           char *meta_path,
+static int dbpf_initialize(char *stoname,
                            TROVE_ds_flags flags)
 {
@@ -672 +669 @@
     dbpf_pid = getpid();
 
-    if (!data_path)
-    {
-        gossip_err("dbpf_initialize failure: invalid data storage path\n");
+    if (!stoname)
+    {
+        gossip_err("dbpf_initialize failure: invalid storage name\n");
         return ret;
     }
 
-    if (!meta_path)
-    {
-        gossip_err("dbpf_initialize failure: invalid metadata storage path\n");
-        return ret;
-    }
-
-    sto_p = dbpf_storage_lookup(data_path, meta_path, &ret, flags);
+    sto_p = dbpf_storage_lookup(stoname, &ret, flags);
     if (sto_p == NULL)
     {
@@ -777 +768 @@
 }
 
-static int dbpf_direct_initialize(char *data_path,
-                                  char *meta_path,
-                                  TROVE_ds_flags flags)
+static int dbpf_direct_initialize(char *stoname, TROVE_ds_flags flags)
 {
     int ret;
 
     /* some parts of initialization are shared with other methods */
-    ret = dbpf_initialize(data_path, meta_path, flags);
+    ret = dbpf_initialize(stoname, flags);
     if(ret < 0)
     {
@@ -848 +837 @@
         }
 
-        free(my_storage_p->data_path);
-        free(my_storage_p->meta_path);
+        free(my_storage_p->name);
         free(my_storage_p);
         my_storage_p = NULL;
@@ -863 +851 @@
  * - creating collections database, filling in create time
  */
-int dbpf_storage_create(char *data_path,
-                        char *meta_path,
+int dbpf_storage_create(char *stoname,
                         void *user_ptr,
                         TROVE_op_id *out_op_id_p)
 {
     int ret = -TROVE_EINVAL;
-    char data_dirname[PATH_MAX] = {0};
-    char meta_dirname[PATH_MAX] = {0};
+    char storage_dirname[PATH_MAX] = {0};
     char sto_attrib_dbname[PATH_MAX] = {0};
     char collections_dbname[PATH_MAX] = {0};
 
-    DBPF_GET_DATA_DIRNAME(data_dirname, PATH_MAX, data_path);
-    ret = dbpf_mkpath(data_dirname, 0755);
+    DBPF_GET_STORAGE_DIRNAME(storage_dirname, PATH_MAX, stoname);
+    ret = dbpf_mkpath(storage_dirname, 0755);
     if (ret != 0)
     {
@@ -881 +867 @@
     }
 
-    DBPF_GET_META_DIRNAME(meta_dirname, PATH_MAX, meta_path);
-    ret = dbpf_mkpath(meta_dirname, 0755);
+    DBPF_GET_STO_ATTRIB_DBNAME(sto_attrib_dbname, PATH_MAX, stoname);
+    ret = dbpf_db_create(storage_dirname, sto_attrib_dbname, NULL, 0);
     if (ret != 0)
     {
-        return ret;
-    }
-
-    DBPF_GET_STO_ATTRIB_DBNAME(sto_attrib_dbname, PATH_MAX, meta_path);
-    ret = dbpf_db_create(sto_attrib_dbname, NULL, 0);
-    if (ret != 0)
-    {
         return ret;
     }
 
-    DBPF_GET_COLLECTIONS_DBNAME(collections_dbname, PATH_MAX, meta_path);
-    ret = dbpf_db_create(collections_dbname, NULL, DB_RECNUM);
+    DBPF_GET_COLLECTIONS_DBNAME(collections_dbname, PATH_MAX, stoname);
+    ret = dbpf_db_create(storage_dirname, collections_dbname, NULL, DB_RECNUM);
     if (ret != 0)
     {
@@ -907 +886 @@
 }
 
-int dbpf_storage_remove(char *data_path,
-                        char *meta_path,
-            void *user_ptr,
-            TROVE_op_id *out_op_id_p)
+int dbpf_storage_remove(char *stoname,
+                        void *user_ptr,
+                        TROVE_op_id *out_op_id_p)
 {
     int ret = -TROVE_EINVAL;
@@ -918 +896 @@
         db_close(my_storage_p->sto_attr_db);
         db_close(my_storage_p->coll_db);
-                free(my_storage_p->meta_path);
-                free(my_storage_p->data_path);
+        free(my_storage_p->name);
         free(my_storage_p);
         my_storage_p = NULL;
     }
-    
-    DBPF_GET_STO_ATTRIB_DBNAME(path_name, PATH_MAX, meta_path);
+    DBPF_GET_STO_ATTRIB_DBNAME(path_name, PATH_MAX, stoname);
     gossip_debug(GOSSIP_TROVE_DEBUG, "Removing %s\n", path_name);
 
@@ -933 +909 @@
     }
 
-    DBPF_GET_COLLECTIONS_DBNAME(path_name, PATH_MAX, meta_path);
+    DBPF_GET_COLLECTIONS_DBNAME(path_name, PATH_MAX, stoname);
     gossip_debug(GOSSIP_TROVE_DEBUG, "Removing %s\n", path_name);
 
@@ -942 +918 @@
     }
 
-    DBPF_GET_META_DIRNAME(path_name, PATH_MAX, meta_path);
+    DBPF_GET_STORAGE_DIRNAME(path_name, PATH_MAX, stoname);
     gossip_debug(GOSSIP_TROVE_DEBUG, "Removing %s\n", path_name);
     if (rmdir(path_name) != 0)
     {
-                perror("failure removing metadata directory");
-                ret = -trove_errno_to_trove_error(errno);
-                goto storage_remove_failure;
-    }
-
-    DBPF_GET_DATA_DIRNAME(path_name, PATH_MAX, data_path);
-    gossip_debug(GOSSIP_TROVE_DEBUG, "Removing %s\n", path_name);
-    if (rmdir(path_name) != 0)
-    {
-        perror("failure removing data directory");
+        perror("failure removing storage space");
         ret = -trove_errno_to_trove_error(errno);
         goto storage_remove_failure;
@@ -1042 +1009 @@
     }
 
-    DBPF_GET_DATA_DIRNAME(path_name, PATH_MAX, sto_p->data_path);
+    DBPF_GET_STORAGE_DIRNAME(path_name, PATH_MAX, sto_p->name);
     ret = stat(path_name, &dirstat);
     if (ret < 0 && errno != ENOENT)
     {
-        gossip_err("stat failed on data directory %s\n", path_name);
+        gossip_err("stat failed on storage directory %s\n", path_name);
         return -trove_errno_to_trove_error(errno);
     }
@@ -1054 +1021 @@
         if (ret != 0)
         {
-            gossip_err("mkdir failed on data directory %s\n", path_name);
+            gossip_err("mkdir failed on storage directory %s\n", path_name);
             return -trove_errno_to_trove_error(errno);
         }
     }
 
-    DBPF_GET_META_DIRNAME(path_name, PATH_MAX, sto_p->meta_path);
-    ret = stat(path_name, &dirstat);
-    if (ret < 0 && errno != ENOENT)
-    {
-                gossip_err("stat failed on metadata directory %s\n", path_name);
-                return -trove_errno_to_trove_error(errno);
-    }
-    else if (ret < 0)
-    {
-                ret = mkdir(path_name, 0755);
-                if (ret != 0)
-                {
-                gossip_err("mkdir failed on metadata directory %s\n", path_name);
-                return -trove_errno_to_trove_error(errno);
-                }
-    }
-
-
-    DBPF_GET_COLL_DIRNAME(path_name, PATH_MAX, sto_p->data_path, new_coll_id);
+    DBPF_GET_COLL_DIRNAME(path_name, PATH_MAX, sto_p->name, new_coll_id);
     ret = mkdir(path_name, 0755);
     if (ret != 0)
     {
-        gossip_err("mkdir failed on data collection directory %s\n", 
-                   path_name);
+        gossip_err("mkdir failed on collection directory %s\n", path_name);
         return -trove_errno_to_trove_error(errno);
     }
 
-    DBPF_GET_COLL_DIRNAME(path_name, PATH_MAX, sto_p->meta_path, new_coll_id);
-    ret = mkdir(path_name, 0755);
-    if (ret != 0)
-    {
-        gossip_err("mkdir failed on metadata collection directory %s\n",
-                   path_name);
-        return -trove_errno_to_trove_error(errno);
-    }
-
     DBPF_GET_COLL_ATTRIB_DBNAME(path_name, PATH_MAX,
-                                sto_p->meta_path, new_coll_id);
+                                sto_p->name, new_coll_id);
 
     ret = stat(path_name, &dbstat);
@@ -1106 +1045 @@
     else if(ret < 0)
     {
-        ret = dbpf_db_create(path_name, NULL, 0);
+        ret = dbpf_db_create(sto_p->name, path_name, NULL, 0);
         if (ret != 0)
         {
@@ -1114 +1053 @@
     }
 
-    db_p = dbpf_db_open(path_name, NULL, &error, NULL, 0);
+    db_p = dbpf_db_open(sto_p->name, path_name, NULL, &error, NULL, 0);
     if (db_p == NULL)
     {
@@ -1162 +1101 @@
     db_close(db_p);
 
-    DBPF_GET_DS_ATTRIB_DBNAME(path_name, PATH_MAX, sto_p->meta_path, 
-                              new_coll_id);
+    DBPF_GET_DS_ATTRIB_DBNAME(path_name, PATH_MAX, sto_p->name, new_coll_id);
     ret = stat(path_name, &dbstat);
     if(ret < 0 && errno != ENOENT)
@@ -1172 +1110 @@
     if(ret < 0)
     {
-        ret = dbpf_db_create(path_name, NULL, 0);
+        ret = dbpf_db_create(sto_p->name, path_name, NULL, 0);
         if (ret != 0)
         {
@@ -1180 +1118 @@
     }
 
-    DBPF_GET_KEYVAL_DBNAME(path_name, PATH_MAX, sto_p->meta_path, new_coll_id);
+    DBPF_GET_KEYVAL_DBNAME(path_name, PATH_MAX, sto_p->name, new_coll_id);
     ret = stat(path_name, &dbstat);
     if(ret < 0 && errno != ENOENT)
@@ -1189 +1127 @@
     if(ret < 0)
     {
-        ret = dbpf_db_create(path_name, NULL, 0);
+        ret = dbpf_db_create(sto_p->name, path_name, NULL, 0);
         if (ret != 0)
         {
@@ -1197 +1135 @@
     }
 
-    DBPF_GET_BSTREAM_DIRNAME(path_name, PATH_MAX, sto_p->data_path,
-                             new_coll_id);
+    DBPF_GET_BSTREAM_DIRNAME(path_name, PATH_MAX, sto_p->name, new_coll_id);
     ret = mkdir(path_name, 0755);
     if(ret != 0)
@@ -1217 +1154 @@
     }
 
-    DBPF_GET_STRANDED_BSTREAM_DIRNAME(path_name, PATH_MAX, sto_p->data_path,
+    DBPF_GET_STRANDED_BSTREAM_DIRNAME(path_name, PATH_MAX, sto_p->name,
                                       new_coll_id);
     ret = mkdir(path_name, 0755);
@@ -1295 +1232 @@
         db_close(db_collection->keyval_db);
         /* so that environment can also be cleaned up */
-        dbpf_putdb_env(db_collection->coll_env, db_collection->meta_path);
+        dbpf_putdb_env(db_collection->coll_env, db_collection->path_name);
         dbpf_collection_deregister(db_collection);
         free(db_collection->name);
-        free(db_collection->meta_path);
-                free(db_collection->data_path);
+        free(db_collection->path_name);
         PINT_dbpf_keyval_pcache_finalize(db_collection->pcache);
         free(db_collection);
@@ -1305 +1241 @@
 
     DBPF_GET_DS_ATTRIB_DBNAME(path_name, PATH_MAX,
-                              sto_p->meta_path, db_data.coll_id);
+                              sto_p->name, db_data.coll_id);
     if (unlink(path_name) != 0)
     {
@@ -1313 +1249 @@
 
     DBPF_GET_KEYVAL_DBNAME(path_name, PATH_MAX,
-                           sto_p->meta_path, db_data.coll_id);
+                           sto_p->name, db_data.coll_id);
     if(unlink(path_name) != 0)
     {
@@ -1321 +1257 @@
 
     DBPF_GET_COLL_ATTRIB_DBNAME(path_name, PATH_MAX,
-                                sto_p->meta_path, db_data.coll_id);
+                                sto_p->name, db_data.coll_id);
     if (unlink(path_name) != 0)
     {
@@ -1329 +1265 @@
 
     DBPF_GET_BSTREAM_DIRNAME(path_name, PATH_MAX,
-                             sto_p->data_path, db_data.coll_id);
+                             sto_p->name, db_data.coll_id);
     for(i = 0; i < DBPF_BSTREAM_MAX_NUM_BUCKETS; i++)
     {
@@ -1375 +1311 @@
 
     DBPF_GET_STRANDED_BSTREAM_DIRNAME(path_name, PATH_MAX,
-                                      sto_p->data_path, db_data.coll_id);
+                                      sto_p->name, db_data.coll_id);
 
     /* remove stranded bstreams directory */
@@ -1418 +1354 @@
 
     DBPF_GET_COLL_DIRNAME(path_name, PATH_MAX,
-                          sto_p->meta_path, db_data.coll_id);
+                          sto_p->name, db_data.coll_id);
     if (rmdir(path_name) != 0)
     {
-                gossip_err("failure removing metadata collection directory\n");
-                ret = -trove_errno_to_trove_error(errno);
-                goto collection_remove_failure;
-    }
-
-    DBPF_GET_COLL_DIRNAME(path_name, PATH_MAX,
-                          sto_p->data_path, db_data.coll_id);
-    if (rmdir(path_name) != 0)
-    {
-        gossip_err("failure removing data collection directory\n");
+        gossip_err("failure removing collection directory\n");
         ret = -trove_errno_to_trove_error(errno);
     }
@@ -1651 +1578 @@
     }
 
-    dbpf_putdb_env(coll_p->coll_env, coll_p->meta_path);
+    dbpf_putdb_env(coll_p->coll_env, coll_p->path_name);
     free(coll_p->name);
-    free(coll_p->data_path);
-    free(coll_p->meta_path);
+    free(coll_p->path_name);
     PINT_dbpf_keyval_pcache_finalize(coll_p->pcache);
 
@@ -1762 +1688 @@
         return -TROVE_ENOMEM;
     }
-    /* Path to data collection dir */
-    snprintf(path_name, PATH_MAX, "/%s/%08x/", sto_p->data_path, 
-             coll_p->coll_id);
-    coll_p->data_path = strdup(path_name);
-    if (!coll_p->data_path) 
+    /* Path to collection */
+    snprintf(path_name, PATH_MAX, "/%s/%08x/", sto_p->name, coll_p->coll_id);
+    coll_p->path_name = strdup(path_name);
+    if (!coll_p->path_name) 
     {
         free(coll_p->name);
@@ -1772 +1697 @@
         return -TROVE_ENOMEM;
     }
-
-    snprintf(path_name, PATH_MAX, "/%s/%08x/", 
-             sto_p->meta_path, coll_p->coll_id);
-    coll_p->meta_path = strdup(path_name);
-    if (!coll_p->meta_path)
-    {
-        free(coll_p->data_path);
-        free(coll_p->name);
-        free(coll_p);
-        return -TROVE_ENOMEM;
-    }
-
-    if ((coll_p->coll_env = dbpf_getdb_env(coll_p->meta_path, COLL_ENV_FLAGS, &ret)) == NULL) 
-    {
-        free(coll_p->meta_path);
-        free(coll_p->data_path);
+    /* per-collection environment */
+    if ((coll_p->coll_env = dbpf_getdb_env(coll_p->path_name, COLL_ENV_FLAGS, &ret)) == NULL) 
+    {
+        free(coll_p->path_name);
         free(coll_p->name);
         free(coll_p);
@@ -1794 +1707 @@
 
     DBPF_GET_COLL_ATTRIB_DBNAME(path_name, PATH_MAX,
-                                sto_p->meta_path, coll_p->coll_id);
-    
-    coll_p->coll_attr_db = dbpf_db_open(path_name, coll_p->coll_env,
+                                sto_p->name, coll_p->coll_id);
+    coll_p->coll_attr_db = dbpf_db_open(sto_p->name, path_name, coll_p->coll_env,
                                         &ret, NULL, 0);
     if (coll_p->coll_attr_db == NULL)
     {
-        dbpf_putdb_env(coll_p->coll_env, coll_p->meta_path);
-        free(coll_p->meta_path);
-        free(coll_p->data_path);
+        dbpf_putdb_env(coll_p->coll_env, coll_p->path_name);
+        free(coll_p->path_name);
         free(coll_p->name);
         free(coll_p);
@@ -1826 +1737 @@
                    db_strerror(ret));
         db_close(coll_p->coll_attr_db);
-        dbpf_putdb_env(coll_p->coll_env, coll_p->meta_path);
-        free(coll_p->meta_path);
-        free(coll_p->data_path);
+        dbpf_putdb_env(coll_p->coll_env, coll_p->path_name);
+        free(coll_p->path_name);
         free(coll_p->name);
         free(coll_p);
@@ -1870 +1780 @@
     {
         db_close(coll_p->coll_attr_db);
-        dbpf_putdb_env(coll_p->coll_env, coll_p->meta_path);
-        free(coll_p->meta_path);
-                free(coll_p->data_path);
+        dbpf_putdb_env(coll_p->coll_env, coll_p->path_name);
+        free(coll_p->path_name);
         free(coll_p->name);
         free(coll_p);
@@ -1884 +1793 @@
 
     DBPF_GET_DS_ATTRIB_DBNAME(path_name, PATH_MAX,
-                              sto_p->meta_path, coll_p->coll_id);
+                              sto_p->name, coll_p->coll_id);
 
     if(sto_major == 0 && sto_minor == 1 && sto_inc < 3)
@@ -1890 +1799 @@
         /* use old comparison function */
         coll_p->ds_db = dbpf_db_open(
-            path_name, coll_p->coll_env, &ret,
+            sto_p->name, path_name, coll_p->coll_env, &ret,
             &PINT_trove_dbpf_ds_attr_compare_reversed, 0);
     }
@@ -1899 +1808 @@
          */
         coll_p->ds_db = dbpf_db_open(
-            path_name, coll_p->coll_env, &ret,
+            sto_p->name, path_name, coll_p->coll_env, &ret,
             &PINT_trove_dbpf_ds_attr_compare, 0);
     }
@@ -1906 +1815 @@
     {
         db_close(coll_p->coll_attr_db);
-        dbpf_putdb_env(coll_p->coll_env, coll_p->meta_path);
-        free(coll_p->meta_path);
-                free(coll_p->data_path);
+        dbpf_putdb_env(coll_p->coll_env, coll_p->path_name);
+        free(coll_p->path_name);
         free(coll_p->name);
         free(coll_p);
@@ -1915 +1823 @@
 
     DBPF_GET_KEYVAL_DBNAME(path_name, PATH_MAX,
-                           sto_p->meta_path, coll_p->coll_id);
-
-    coll_p->keyval_db = dbpf_db_open(path_name, coll_p->coll_env,
+                           sto_p->name, coll_p->coll_id);
+    coll_p->keyval_db = dbpf_db_open(sto_p->name, path_name, coll_p->coll_env,
                                      &ret, PINT_trove_dbpf_keyval_compare, 0);
     if(coll_p->keyval_db == NULL)
@@ -1923 +1830 @@
         db_close(coll_p->coll_attr_db);
         db_close(coll_p->ds_db);
-        dbpf_putdb_env(coll_p->coll_env, coll_p->meta_path);
-        free(coll_p->meta_path);
-                free(coll_p->data_path);
+        dbpf_putdb_env(coll_p->coll_env, coll_p->path_name);
+        free(coll_p->path_name);
         free(coll_p->name);
         free(coll_p);
@@ -1937 +1843 @@
         db_close(coll_p->keyval_db);
         db_close(coll_p->ds_db);
-        dbpf_putdb_env(coll_p->coll_env, coll_p->meta_path);
-        free(coll_p->meta_path);
-                free(coll_p->data_path);
+        dbpf_putdb_env(coll_p->coll_env, coll_p->path_name);
+        free(coll_p->path_name);
         free(coll_p->name);
         free(coll_p);
@@ -1977 +1882 @@
  */
 struct dbpf_storage *dbpf_storage_lookup(
-    char *data_path, char *meta_path, int *error_p, TROVE_ds_flags flags)
+    char *stoname, int *error_p, TROVE_ds_flags flags)
 {
     char path_name[PATH_MAX] = {0};
@@ -1988 +1893 @@
     }
 
-    if (stat(data_path, &sbuf) < 0) 
+    if (stat(stoname, &sbuf) < 0) 
     {
         *error_p = -TROVE_ENOENT;
@@ -1996 +1901 @@
     {
         *error_p = -TROVE_EINVAL;
-        gossip_err("%s is not a directory\n", data_path);
+        gossip_err("%s is not a directory\n", stoname);
         return NULL;
-    }
-
-    if (stat(meta_path, &sbuf) < 0)
-    {
-        *error_p = -TROVE_ENOENT;
-        return NULL;
-    }
-    if (!S_ISDIR(sbuf.st_mode))
-    {
-        *error_p = -TROVE_EINVAL;
-        gossip_err("%s is not a directory\n", meta_path);
-        return NULL;
     }
 
@@ -2020 +1913 @@
     memset(sto_p, 0, sizeof(struct dbpf_storage));
 
-    sto_p->data_path = strdup(data_path);
-    if (sto_p->data_path == NULL)
+    sto_p->name = strdup(stoname);
+    if (sto_p->name == NULL)
     {
         free(sto_p);
@@ -2027 +1920 @@
         return NULL;
     }
-    sto_p->meta_path = strdup(meta_path);
-    if (sto_p->meta_path == NULL)
-    {
-        free(sto_p->data_path);
-        free(sto_p);
-        *error_p = -TROVE_ENOMEM;
-        return NULL;
-    }
     sto_p->refct = 0;
     sto_p->flags = flags;
 
-    DBPF_GET_STO_ATTRIB_DBNAME(path_name, PATH_MAX, meta_path);
+    DBPF_GET_STO_ATTRIB_DBNAME(path_name, PATH_MAX, stoname);
 
     /* we want to stat the attrib db first in case it doesn't
@@ -2049 +1934 @@
     }
 
-    sto_p->sto_attr_db = dbpf_db_open(path_name, NULL,
+    sto_p->sto_attr_db = dbpf_db_open(sto_p->name, path_name, NULL,
                                       error_p, NULL, 0);
     if (sto_p->sto_attr_db == NULL)
     {
-        free(sto_p->meta_path);
-                free(sto_p->data_path);
+        free(sto_p->name);
         free(sto_p);
         my_storage_p = NULL;
@@ -2060 +1944 @@
     }
 
-    DBPF_GET_COLLECTIONS_DBNAME(path_name, PATH_MAX, meta_path);
-
-    sto_p->coll_db = dbpf_db_open(path_name, NULL, 
+    DBPF_GET_COLLECTIONS_DBNAME(path_name, PATH_MAX, stoname);
+
+    sto_p->coll_db = dbpf_db_open(sto_p->name, path_name, NULL, 
                                   error_p, NULL, DB_RECNUM);
     if (sto_p->coll_db == NULL)
     {
         db_close(sto_p->sto_attr_db);
-        free(sto_p->meta_path);
-                free(sto_p->data_path);
+        free(sto_p->name);
         free(sto_p);
         my_storage_p = NULL;
@@ -2205 +2088 @@
  * a db plus files storage region.
  */
-static int dbpf_db_create(char *dbname,
+static int dbpf_db_create(const char *sto_path,
+                          char *dbname,
                           DB_ENV *envp,
                           uint32_t flags)
@@ -2248 +2132 @@
  */
 static DB *dbpf_db_open(
-    char *dbname, DB_ENV *envp, int *error_p,
+    const char *sto_path, char *dbname, DB_ENV *envp, int *error_p,
     int (*compare_fn) (DB *db, const DBT *dbt1, const DBT *dbt2),
     uint32_t flags)

trunk/src/io/trove/trove-dbpf/dbpf-open-cache.c

@@ -428 +428 @@
 
     DBPF_GET_BSTREAM_FILENAME(filename, PATH_MAX,
-                              my_storage_p->data_path, coll_id, llu(handle));
+                              my_storage_p->name, coll_id, llu(handle));
 
     ret = fast_unlink(filename, coll_id, handle);
@@ -460 +460 @@
 
     DBPF_GET_BSTREAM_FILENAME(filename, PATH_MAX,
-                              my_storage_p->data_path, coll_id, llu(handle));
+                              my_storage_p->name, coll_id, llu(handle));
 
     gossip_debug(GOSSIP_DBPF_OPEN_CACHE_DEBUG,
@@ -548 +548 @@
     }
     DBPF_GET_STRANDED_BSTREAM_FILENAME(tmp_item->pathname, PATH_MAX,
-                                       my_storage_p->data_path, 
+                                       my_storage_p->name, 
                                        coll_id,
                                        llu(handle));

trunk/src/io/trove/trove-dbpf/dbpf.h

@@ -69 +69 @@
 ((__handle) % DBPF_BSTREAM_MAX_NUM_BUCKETS)
 
-#define DBPF_GET_DATA_DIRNAME(__buf, __path_max, __base)                 \
-do { snprintf(__buf, __path_max, "/%s", __base); } while (0)
-
-#define DBPF_GET_META_DIRNAME(__buf, __path_max, __base)                 \
-do { snprintf(__buf, __path_max, "/%s", __base); } while (0)
+#define DBPF_GET_STORAGE_DIRNAME(__buf, __path_max, __stoname)          \
+do { snprintf(__buf, __path_max, "/%s", __stoname); } while (0)
 
 #define STO_ATTRIB_DBNAME "storage_attributes.db"
-#define DBPF_GET_STO_ATTRIB_DBNAME(__buf, __path_max, __base)            \
+#define DBPF_GET_STO_ATTRIB_DBNAME(__buf, __path_max, __stoname)         \
 do {                                                                     \
-  snprintf(__buf, __path_max, "/%s/%s", __base, STO_ATTRIB_DBNAME);      \
+  snprintf(__buf, __path_max, "/%s/%s", __stoname, STO_ATTRIB_DBNAME);   \
 } while (0)
 
 #define COLLECTIONS_DBNAME "collections.db"
-#define DBPF_GET_COLLECTIONS_DBNAME(__buf, __path_max, __base)           \
+#define DBPF_GET_COLLECTIONS_DBNAME(__buf, __path_max, __stoname)        \
 do {                                                                     \
-  snprintf(__buf, __path_max, "/%s/%s", __base, COLLECTIONS_DBNAME);     \
+  snprintf(__buf, __path_max, "/%s/%s", __stoname, COLLECTIONS_DBNAME);  \
 } while (0)
 
-#define DBPF_GET_COLL_DIRNAME(__buf, __path_max, __base, __collid)       \
+#define DBPF_GET_COLL_DIRNAME(__buf, __path_max, __stoname, __collid)    \
 do {                                                                     \
-  snprintf(__buf, __path_max, "/%s/%08x", __base, __collid);             \
+  snprintf(__buf, __path_max, "/%s/%08x", __stoname, __collid);          \
 } while (0)
 
 #define COLL_ATTRIB_DBNAME "collection_attributes.db"
-#define DBPF_GET_COLL_ATTRIB_DBNAME(__buf,__path_max,__base,__collid)    \
+#define DBPF_GET_COLL_ATTRIB_DBNAME(__buf,__path_max,__stoname,__collid) \
 do {                                                                     \
-  snprintf(__buf, __path_max, "/%s/%08x/%s", __base, __collid,           \
+  snprintf(__buf, __path_max, "/%s/%08x/%s", __stoname, __collid,        \
            COLL_ATTRIB_DBNAME);                                          \
 } while (0)
 
 #define DS_ATTRIB_DBNAME "dataspace_attributes.db"
-#define DBPF_GET_DS_ATTRIB_DBNAME(__buf,__path_max,__base,__collid)      \
+#define DBPF_GET_DS_ATTRIB_DBNAME(__buf,__path_max,__stoname,__collid)   \
 do {                                                                     \
-  snprintf(__buf, __path_max, "/%s/%08x/%s", __base, __collid,           \
+  snprintf(__buf, __path_max, "/%s/%08x/%s", __stoname, __collid,        \
            DS_ATTRIB_DBNAME);                                            \
 } while (0)
 
 #define BSTREAM_DIRNAME "bstreams"
-#define DBPF_GET_BSTREAM_DIRNAME(__buf, __path_max, __base, __collid)    \
+#define DBPF_GET_BSTREAM_DIRNAME(__buf, __path_max, __stoname, __collid) \
 do {                                                                     \
-  snprintf(__buf, __path_max, "/%s/%08x/%s", __base, __collid,           \
+  snprintf(__buf, __path_max, "/%s/%08x/%s", __stoname, __collid,        \
            BSTREAM_DIRNAME);                                             \
 } while (0)
@@ -115 +112 @@
 #define STRANDED_BSTREAM_DIRNAME "stranded-bstreams"
 #define DBPF_GET_STRANDED_BSTREAM_DIRNAME(                       \
-        __buf, __path_max, __base, __collid)                     \
+        __buf, __path_max, __stoname, __collid)                  \
     do {                                                         \
         snprintf(__buf, __path_max, "/%s/%08x/%s",               \
-                 __base, __collid, STRANDED_BSTREAM_DIRNAME);    \
+                 __stoname, __collid, STRANDED_BSTREAM_DIRNAME); \
     } while(0)
 
-/* arguments are: buf, path_max, base, collid, handle */
-#define DBPF_GET_BSTREAM_FILENAME(__b, __pm, __base, __cid, __handle)     \
+/* arguments are: buf, path_max, stoname, collid, handle */
+#define DBPF_GET_BSTREAM_FILENAME(__b, __pm, __stoname, __cid, __handle)  \
 do {                                                                      \
   snprintf(__b, __pm, "/%s/%08x/%s/%.8llu/%08llx.bstream",                \
-           __base, __cid, BSTREAM_DIRNAME,                                \
+           __stoname, __cid, BSTREAM_DIRNAME,                             \
            llu(DBPF_BSTREAM_GET_BUCKET(__handle)), llu(__handle));        \
 } while (0)
 
-/* arguments are: buf, path_max, base, collid, handle */
+/* arguments are: buf, path_max, stoname, collid, handle */
 #define DBPF_GET_STRANDED_BSTREAM_FILENAME(                  \
-        __b, __pm, __base, __cid, __handle)                  \
+        __b, __pm, __stoname, __cid, __handle)               \
     do {                                                     \
         snprintf(__b, __pm, "/%s/%08x/%s/%08llx.bstream",    \
-                 __base, __cid, STRANDED_BSTREAM_DIRNAME,    \
+                 __stoname, __cid, STRANDED_BSTREAM_DIRNAME, \
                  llu(__handle));                             \
     } while(0)
 
-/* arguments are: buf, path_max, base, collid */
+/* arguments are: buf, path_max, stoname, collid */
 #define KEYVAL_DBNAME "keyval.db"
-#define DBPF_GET_KEYVAL_DBNAME(__buf,__path_max,__base,__collid)         \
+#define DBPF_GET_KEYVAL_DBNAME(__buf,__path_max,__stoname,__collid)      \
 do {                                                                     \
-  snprintf(__buf, __path_max, "/%s/%08x/%s", __base, __collid,           \
+  snprintf(__buf, __path_max, "/%s/%08x/%s", __stoname, __collid,        \
            KEYVAL_DBNAME);                                               \
 } while (0)
@@ -201 +198 @@
     TROVE_ds_flags flags;
     int refct;
-    char *data_path;   /* path to data storage directory */
-    char *meta_path;   /* path to metadata storage directory */
+    char *name;
     DB *sto_attr_db;
     DB *coll_db;
@@ -211 +207 @@
     int refct;
     char *name;
-    char *data_path;  /* path to data collection directory */
-    char *meta_path;  /* path to metadata collection directory */
+    char *path_name;
     DB *coll_attr_db;
     DB *ds_db;
@@ -695 +690 @@
 
 struct dbpf_storage *dbpf_storage_lookup(
-    char *data_path, char *meta_path, int *error_p, TROVE_ds_flags flags);
-
-int dbpf_storage_create(char *data_path,
-                        char *meta_path,
+    char *stoname, int *error_p, TROVE_ds_flags flags);
+
+int dbpf_storage_create(char *stoname,
                         void *user_ptr,
                         TROVE_op_id *out_op_id_p);
 
-int dbpf_storage_remove(char *data_path,
-                        char *meta_path,
+int dbpf_storage_remove(char *stoname,
                         void *user_ptr,
                         TROVE_op_id *out_op_id_p);

trunk/src/io/trove/trove-internal.h

@@ -390 +390 @@
 {
     int (*initialize)(
-                      char *data_path,
-                      char *meta_path,
+                      char *stoname,
                       TROVE_ds_flags flags);
     
@@ -397 +396 @@
     
     int (*storage_create)(
-                          char *data_path,
-                          char *meta_path,
+                          char *stoname,
                           void *user_ptr,
                           TROVE_op_id *out_op_id_p);
     
     int (*storage_remove)(
-                          char *data_path,
-                          char *meta_path,
+                          char *stoname,
                           void *user_ptr,
                           TROVE_op_id *out_op_id_p);
     
     int (*collection_create)(
+                             /* char *stoname, */
                              char *collname,
                              TROVE_coll_id new_coll_id,
@@ -415 +413 @@
 
     int (*collection_remove)(
+                             /* char *stoname, */
                              char *collname,
                              void *user_ptr,
@@ -420 +419 @@
     
     int (*collection_lookup)(
+                             /* char *stoname, */
                              char *collname,
                              TROVE_coll_id *coll_id_p,

trunk/src/io/trove/trove-mgmt.c

@@ -88 +88 @@
 int trove_initialize(TROVE_method_id method_id,
                      TROVE_method_callback method_callback,
-                     char *data_path,
-                                 char *meta_path,
+                     char *stoname,
                      TROVE_ds_flags flags)
 {
@@ -121 +120 @@
     */
     ret = mgmt_method_table[method_id]->initialize(
-        data_path, meta_path, flags);
+        stoname, flags);
     if (ret > -1)
     {
@@ -156 +155 @@
 
 int trove_storage_create(TROVE_method_id method_id,
-                         char *data_path,
-                                                 char *meta_path,
+                         char *stoname,
                          void *user_ptr,
                          TROVE_op_id *out_op_id_p)
 {
     int ret = mgmt_method_table[method_id]->storage_create(
-                  data_path, meta_path, user_ptr, out_op_id_p);
+        stoname, user_ptr, out_op_id_p);
 
     return ((ret < 0) ? ret : 1);
@@ -169 +167 @@
 
 int trove_storage_remove(TROVE_method_id method_id,
-                         char *data_path,
-                                                 char *meta_path,
+                         char *stoname,
                          void *user_ptr,
                          TROVE_op_id *out_op_id_p)
 {
     int ret = mgmt_method_table[method_id]->storage_remove(
-                  data_path, meta_path, user_ptr, out_op_id_p);
+        stoname, user_ptr, out_op_id_p);
 
     return ((ret < 0) ? ret : 1);

trunk/src/io/trove/trove-migrate.c

@@ -43 +43 @@
  * Prototypes
  */
-static int migrate_collection_0_1_3 (TROVE_coll_id coll_id,
-                                     const char* data_path,
-                                     const char* meta_path);
+static int migrate_collection_0_1_3 (TROVE_coll_id coll_id,const char* stoname);
 
 /*
@@ -57 +55 @@
     int minor;
     int incremental;
-    int (*migrate)(TROVE_coll_id coll_id,
-                 const char* data_path,
-                 const char* meta_path);
+    int (*migrate)(TROVE_coll_id coll_id, const char* stoname);
 };
 
@@ -248 +244 @@
  * trove_migrate
  *   method_id - method used to for trove access
- *   data_path - path to data storage
- *   meta_path - path to metadata storage
+ *   stoname   - path to storage
  *
  * Iterate over all collections and migrate each one.
  * \return 0 on success, non-zero on failure
  */
-int trove_migrate (TROVE_method_id method_id, const char* data_path,
-                   const char* meta_path)
+int trove_migrate (TROVE_method_id method_id, const char* stoname)
 {
     TROVE_ds_position pos;
@@ -329 +323 @@
                                migrate_p->minor,
                                migrate_p->incremental);
-                    ret = migrate_p->migrate(coll_id, data_path, meta_path);
+                    ret = migrate_p->migrate(coll_id, stoname);
                     if (ret < 0)
                     {
                         gossip_err("migrate failed: \
-ret=%d coll=%d metadir=%s datadir=%s major=%d minor=%d incremental=%d\n",
-                                   ret, coll_id, meta_path, data_path,
-                                   migrate_p->major, migrate_p->minor, 
-                                   migrate_p->incremental);
+ret=%d coll=%d stoname=%s major=%d minor=%d incremental=%d\n",
+                                   ret, coll_id, stoname, migrate_p->major,
+                                   migrate_p->minor, migrate_p->incremental);
                         goto complete;
                     }
@@ -386 +379 @@
 /*
  * migrate_collection_0_1_3
- *   coll_id   - collection id
- *   data_path - path to data storage
- *   meta_path - path to metadata storage
+ *   coll_id - collection id
+ *   stoname - path to storage
  *
  * For each datafile handle, check the file length and update the
@@ -394 +386 @@
  * \return 0 on success, non-zero on failure
  */
-static int migrate_collection_0_1_3 (TROVE_coll_id coll_id, 
-                                     const char* data_path,
-                                     const char* meta_path)
+static int migrate_collection_0_1_3 (TROVE_coll_id coll_id, const char* stoname)
 {
     TROVE_context_id  context_id = PVFS_CONTEXT_NULL;
@@ -560 +550 @@
                 DBPF_GET_BSTREAM_FILENAME(filename,
                                           PATH_MAX,
-                                          data_path,
+                                          stoname,
                                           coll_id,
                                           llu(handles[i]));

trunk/src/io/trove/trove.h

@@ -100 +100 @@
     TROVE_method_id method_id,
     TROVE_method_callback method_callback,
-    char *data_path,
-    char *meta_path,
+    char *stoname,
     TROVE_ds_flags flags);
 
 int trove_finalize(TROVE_method_id method_id);
 
-int trove_migrate(TROVE_method_id method_id, const char* data_path,
-                  const char* meta_path);
+int trove_migrate(TROVE_method_id method_id, const char* stoname);
 
 int trove_open_context(
@@ -123 +121 @@
 int trove_storage_create(
     TROVE_method_id method_id,
-    char *data_path,
-    char *meta_path,
+    char *stoname,
     void *user_ptr,
     TROVE_op_id *out_op_id_p);
@@ -130 +127 @@
 int trove_storage_remove(
     TROVE_method_id method_id,
-    char *data_path,
-    char *meta_path,
+    char *stoname,
     void *user_ptr,
     TROVE_op_id *out_op_id_p);
 
 int trove_collection_create(
+/* char *stoname, */
     char *collname,
     TROVE_coll_id new_coll_id,
@@ -143 +140 @@
 int trove_collection_remove(
     TROVE_method_id method_id,
+/* char *stoname, */
     char *collname,
     void *user_ptr,
@@ -149 +147 @@
 int trove_collection_lookup(
     TROVE_method_id method_id,
+/* char *stoname, */
     char *collname,
     TROVE_coll_id *out_coll_id_p,

trunk/src/proto/endecode-funcs.h

@@ -110 +110 @@
         *(pptr) += roundup8(4 + len + 1); \
     } else { \
-        *(u_int32_t *) *(pptr) = 0; \
+        *(u_int32_t *) (*(pptr)+4) = 0; \
         *(pptr) += 8; \
     } \

trunk/src/server/pvfs2-server.c

@@ -788 +788 @@
         server_config.trove_method, 
         trove_coll_to_method_callback,
-        server_config.data_path,
-                server_config.meta_path,
+        server_config.storage_path,
         init_flags);
     if (ret < 0)
@@ -796 +795 @@
 
         gossip_err("\n***********************************************\n");
-        gossip_err("Invalid Storage Space: %s or %s\n\n",
-                   server_config.data_path, server_config.meta_path);
+        gossip_err("Invalid Storage Space: %s\n\n",
+                   server_config.storage_path);
         gossip_err("Storage initialization failed.  The most "
                    "common reason\nfor this is that the storage space "
@@ -1089 +1088 @@
      * Migrate database if needed
      */
-    ret = trove_migrate(server_config.trove_method,
-                        server_config.data_path,
-                        server_config.meta_path);
+    ret = trove_migrate(server_config.trove_method,server_config.storage_path);
     if (ret < 0)
     {

trunk/test/automated/README.tests

@@ -1 +1 @@
 #
-# $Date: 2009-09-01 18:55:53 $
+# $Date: 2009-09-02 21:10:42 $
 #
 # A brief description of the contents of the test/automated directory

trunk/test/io/buffer/trove-init.c

@@ -72 +72 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed: run trove-mkfs first.\n");

trunk/test/io/flow/test-bmi-cache-server.c

@@ -103 +103 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0)
     {

trunk/test/io/flow/test-harness-server-trove.c

@@ -108 +108 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0)
     {

trunk/test/io/flow/test1-server.c

@@ -105 +105 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0)
     {

trunk/test/io/job/job-client-example.c

@@ -52 +52 @@
 
         ret = trove_initialize(
-            TROVE_METHOD_DBPF, NULL, "/tmp/pvfs2-test-space", "/tmp/pvfs2-test-space", 0);
+            TROVE_METHOD_DBPF, NULL, "/tmp/pvfs2-test-space", 0);
         if(ret < 0)
         {

trunk/test/io/job/job-server-example.c

@@ -57 +57 @@
 
         ret = trove_initialize(
-            TROVE_METHOD_DBPF, NULL, "/tmp/pvfs2-test-space", "/tmp/pvfs2-test-space", 0);
+            TROVE_METHOD_DBPF, NULL, "/tmp/pvfs2-test-space", 0);
         if(ret < 0)
         {

trunk/test/io/job/module.mk.in

@@ -6 +6 @@
         $(DIR)/job-server-example.c \
         $(DIR)/trove-job-create-toy.c \
-        $(DIR)/trove-job-io.c \
         $(DIR)/trove-job-ls.c \
         $(DIR)/trove-job-mkfs.c \

trunk/test/io/job/trove-job-create-toy.c

@@ -40 +40 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/job/trove-job-ls.c

@@ -48 +48 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/job/trove-job-mkfs.c

@@ -72 +72 @@
     /* try to initialize; fails if storage space isn't there? */
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "warning: initialize failed.  trying to create storage space.\n");
@@ -79 +79 @@
         /* Q: what good is the op_id here if we have to match on coll_id in test fn? */
         ret = trove_storage_create(
-            TROVE_METHOD_DBPF, storage_space, storage_space, NULL, &op_id);
+            TROVE_METHOD_DBPF, storage_space, NULL, &op_id);
         if (ret < 0) {
             fprintf(stderr, "storage create failed.\n");
@@ -87 +87 @@
         /* second try at initialize, in case it failed first try. */
         ret = trove_initialize(
-            TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+            TROVE_METHOD_DBPF, NULL, storage_space, 0);
         if (ret < 0) {
             fprintf(stderr, "initialized failed second time.\n");

trunk/test/io/job/trove-job-touch.c

@@ -44 +44 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/trove/test-listio.c

@@ -76 +76 @@
 
         ret = trove_initialize(
-            TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+            TROVE_METHOD_DBPF, NULL, storage_space, 0);
         if (ret < 0) {
             fprintf(stderr, "initialize failed: run trove-mkfs first.\n");

trunk/test/io/trove/test-listio2.c

@@ -80 +80 @@
 
         ret = trove_initialize(
-            TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+            TROVE_METHOD_DBPF, NULL, storage_space, 0);
         if (ret < 0) {
             fprintf(stderr, "initialize failed: run trove-mkfs first.\n");

trunk/test/io/trove/test-listio3.c

@@ -79 +79 @@
 
         ret = trove_initialize(
-            TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+            TROVE_METHOD_DBPF, NULL, storage_space, 0);
         if (ret < 0) {
             fprintf(stderr, "initialize failed: run trove-mkfs first.\n");

trunk/test/io/trove/test-listio4.c

@@ -79 +79 @@
 
         ret = trove_initialize(
-            TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+            TROVE_METHOD_DBPF, NULL, storage_space, 0);
         if (ret < 0) {
             fprintf(stderr, "initialize failed: run trove-mkfs first.\n");

trunk/test/io/trove/test-listio5.c

@@ -84 +84 @@
 
         ret = trove_initialize(
-            TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+            TROVE_METHOD_DBPF, NULL, storage_space, 0);
         if (ret < 0) {
             fprintf(stderr, "initialize failed: run trove-mkfs first.\n");

trunk/test/io/trove/test-trove-cancel.c

@@ -79 +79 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed: run trove-mkfs first.\n");

trunk/test/io/trove/trove-bstream.c

@@ -44 +44 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0 ) {
         fprintf(stderr, "initialize failed\n");

trunk/test/io/trove/trove-create-stress.c

@@ -47 +47 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/trove/trove-export.c

@@ -53 +53 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/trove/trove-import.c

@@ -58 +58 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/trove/trove-key-iterate.c

@@ -126 +126 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/trove/trove-ls.c

@@ -47 +47 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/trove/trove-mkdir.c

@@ -45 +45 @@
         
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/trove/trove-mkfs.c

@@ -37 +37 @@
 
     /* try to initialize; fails if storage space isn't there? */
-    ret = trove_initialize(TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+    ret = trove_initialize(TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "warning: initialize failed.  trying to create storage space.\n");
@@ -43 +43 @@
         /* create the storage space */
         /* Q: what good is the op_id here if we have to match on coll_id in test fn? */
-        ret = trove_storage_create(TROVE_METHOD_DBPF, storage_space, storage_space, NULL, &op_id);
+        ret = trove_storage_create(TROVE_METHOD_DBPF, storage_space, NULL, &op_id);
         if (ret < 0) {
             fprintf(stderr, "storage create failed.\n");
@@ -50 +50 @@
 
         /* second try at initialize, in case it failed first try. */
-        ret = trove_initialize(TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        ret = trove_initialize(TROVE_METHOD_DBPF, NULL, storage_space, 0);
         if (ret < 0) {
             fprintf(stderr, "initialized failed second time.\n");

trunk/test/io/trove/trove-rm.c

@@ -42 +42 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/trove/trove-rmdir.c

@@ -42 +42 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/io/trove/trove-touch.c

@@ -44 +44 @@
 
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, storage_space, 0);
     if (ret < 0) {
         fprintf(stderr, "initialize failed.\n");

trunk/test/server/showconfig.c

@@ -43 +43 @@
     fprintf(stderr,"Server ID                : %s\n",
             serverconfig.host_id);
-    fprintf(stderr,"Data Storage Space            : %s\n",
-            serverconfig.data_path);
-    fprintf(stderr,"Meta Storage Space            : %s\n",
-            serverconfig.meta_path);
+    fprintf(stderr,"Storage Space            : %s\n",
+            serverconfig.storage_path);
     fprintf(stderr,"FS Config File Name      : %s (%d bytes)\n",
             serverconfig.fs_config_filename,