Changeset 8397 for branches/cu-security-branch/src/apps/admin

Timestamp:

06/18/10 20:02:50 (3 years ago)

Author:

nlmills

Message:

initial merge with Orange-Branch. much will be broken

Location:

branches/cu-security-branch

Files:

• . (modified) (1 prop)
• src/apps/admin (modified) (1 prop)
• src/apps/admin/pvfs2-change-fsid.c (modified) (8 diffs)
• src/apps/admin/pvfs2-check-config.c (modified) (1 diff)
• src/apps/admin/pvfs2-cp.c (modified) (1 diff)
• src/apps/admin/pvfs2-fs-dump.c (modified) (1 diff)
• src/apps/admin/pvfs2-fsck.c (modified) (3 diffs)
• src/apps/admin/pvfs2-genconfig (modified) (26 diffs)
• src/apps/admin/pvfs2-getmattr (added)
• src/apps/admin/pvfs2-ls.c (modified) (28 diffs)
• src/apps/admin/pvfs2-migrate-collection.c (modified) (32 diffs)
• src/apps/admin/pvfs2-mkspace.c (modified) (9 diffs)
• src/apps/admin/pvfs2-setmattr (added)
• src/apps/admin/pvfs2-showcoll.c (modified) (8 diffs)
• src/apps/admin/pvfs2-stat.c (modified) (4 diffs)
• src/apps/admin/pvfs2-xattr.c (modified) (17 diffs)

branches/cu-security-branch

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk

branches/cu-security-branch/src/apps/admin/pvfs2-change-fsid.c

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

branches/cu-security-branch/src/apps/admin/pvfs2-check-config.c

@@ -129 +129 @@
         return -1;
     }
-    
+
     /* Construct the list of mount points */
     mnt = PVFS_util_parse_pvfstab(0);

branches/cu-security-branch/src/apps/admin/pvfs2-cp.c

@@ -304 +304 @@
         "\n-s <strip_size>\t\t\tsize of access to PVFS2 volume"
         "\n-n <num_datafiles>\t\tnumber of PVFS2 datafiles to use"
-        "\n-b <buffer_size>\t\thow much data to read/write at once"
+        "\n-b <buffer_size in bytes>\thow much data to read/write at once"
         "\n-t\t\t\t\tprint some timing information"
         "\n-v\t\t\t\tprint version number and exit\n");

branches/cu-security-branch/src/apps/admin/pvfs2-fs-dump.c

@@ -361 +361 @@
     {
         PVFS_util_refresh_credential(creds);
-        ret = PVFS_mgmt_iterate_handles_list(cur_fs,
+        ret = PVFS_mgmt_iterate_handles_list(cur_fs,
                                              creds,
                                              handle_matrix,

branches/cu-security-branch/src/apps/admin/pvfs2-fsck.c

@@ -900 +900 @@
         PVFS_sysresp_getattr getattr_resp;
 
-        PVFS_util_refresh_credential(creds);
+        PVFS_util_refresh_credential(creds);
 
         handle_ref.handle = handle;
@@ -983 +983 @@
         PVFS_sysresp_getattr getattr_resp;
 
-        PVFS_util_refresh_credential(creds);
+        PVFS_util_refresh_credential(creds);
 
         handle_ref.handle = handle;
@@ -1096 +1096 @@
         PVFS_sysresp_getattr getattr_resp;
 
-        PVFS_util_refresh_credential(creds);
+        PVFS_util_refresh_credential(creds);
 
         handle_ref.handle = handle;

branches/cu-security-branch/src/apps/admin/pvfs2-genconfig

@@ -10 +10 @@
 use Getopt::Long;
 use Math::BigInt;
-use File::Basename;
-use Cwd 'abs_path';;
 
 # turn on strictness
@@ -31 +29 @@
 my $opt_logfile = '';
 my $opt_storage = '';
-my $opt_pubkey = '';
-my $opt_privkey = '';
 my $opt_trovesync = '1';
 my $opt_trovemethod = '';
@@ -61 +57 @@
 
 my $default_storage = undef;
+my $default_meta_storage = undef;
 my $default_logfile = undef;
-my $default_pubkey = undef;
-my $default_privkey = undef;
-my $security_flag = '';
 
 my $bmi_module = undef;
@@ -75 +69 @@
 my $OUT = undef;
 my $term = undef;
-my $dirname = undef;
 
 #$num_unexp_reqs = prompt_num("How many unexpected requests should we be prepared to receive?  ");
@@ -158 +151 @@
     #
     @components = $inputline =~ /(?:,?[ ]*([^{,]+(?:{[^}]+})?[^,]*))/g;
-    foreach my $comp (@components)
-    {
+    foreach my $comp_ws (@components)
+    {
+        my $comp;
+
+        # Trim leading and trailing whitespace
+        $comp = $comp_ws;
+        $comp =~ s/^\s+//;
+        $comp =~ s/\s+$//;
+
         # if we've got a component that has {..}, then expand.
         # match the prefix (hostname) and curly brackets
@@ -217 +217 @@
     if(defined($default_storage))
     {
-        print $target "\n\tStorageSpace " . $default_storage . "\n";
+        print $target "\n\tDataStorageSpace " . $default_storage . "\n";
+    }
+
+    if(defined($default_meta_storage))
+    {
+        print $target "\tMetadataStorageSpace " . $default_meta_storage . "\n\n";
     }
 
@@ -228 +233 @@
     {
         print $target "\tTCPBindSpecific yes\n";
-    }
-    
-    if(!($default_pubkey eq ""))
-    {
-        print $target "\tKeyStore " . $default_pubkey . "\n";
-    }
-    
-    if(!($default_privkey eq ""))
-    {
-        print $target "\tServerKey " . $default_privkey . "\n";
     }
 
@@ -391 +386 @@
         print $target "\n<ServerOptions>\n";
         print $target "\tServer $alias\n";
-        print $target "\tStorageSpace $endpoint->{STORAGE}\n";
+        print $target "\tDataStorageSpace $endpoint->{STORAGE}\n";
+        print $target "\tMetadataStorageSpace $endpoint->{METASTORAGE}\n";
         print $target "\tLogFile $endpoint->{LOGFILE}\n";
         print $target "</ServerOptions>\n";
@@ -400 +396 @@
 sub emit_server_conf
 {
-    my($target, $node, $storage, $logfile) = @_;
-
-    print $target "StorageSpace $storage\n";
+    my($target, $node, $storage, $metastorage, $logfile) = @_;
+
+    print $target "DataStorageSpace $storage\n";
+    print $target "MetadataStorageSpace $metastorage\n";
     print $target "HostID \"" . get_bmi_endpoint($node) . "\"\n";
     print $target "LogFile $logfile\n";
@@ -853 +850 @@
 }
 
-sub get_pubkey
-{
-    my $pubkey = $dirname . "/keystore";
-    if ($opt_pubkey) {
-        $pubkey = $opt_pubkey;
+sub get_meta_storage
+{
+    my $metastorage = "/pvfs2-storage-space";
+    if ($opt_storage) {
+        $metastorage = $opt_storage;
     } elsif (!$opt_quiet) {
-        if($security_flag eq "")
-        {
-            print $OUT "Choose whether or not you compiled with encryption enabled.\n";
-            $security_flag = prompt_word("Did you compile with encryption [Default is n]? ","n");
-        }
-        if(($security_flag eq "n" or $security_flag eq "no"))
-        {
-            return "";
-        }
-        print $OUT "Choose the path to the public key file.\n";
-        $pubkey = prompt_word("Enter public key file path: [Default is " . $dirname . "/keystore]: ",$dirname . "/keystore");
-    }
-    return $pubkey;
-}
-
-sub get_privkey
-{
-    if(($security_flag eq "n" or $security_flag eq "no"))
-    {
-        return "";
-    }
-    my $privkey = $dirname . "/privkey.pem";
-    if ($opt_privkey) {
-        $privkey = $opt_privkey;
-    } elsif (!$opt_quiet) {
-        print $OUT "Choose the path to the private key file.\n";
-        $privkey = prompt_word("Enter private key file path: [Default is " . $dirname . "/privkey.pem]: ",$dirname . "/privkey.pem");
-    }
-    return $privkey;
-}
-
+            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
@@ -995 +966 @@
     my $portmap = shift;
     my $storage = shift;
+    my $metastorage = shift;
     my $logfile = shift;
-    my $pubkey = shift;
-    my $privkey = shift;
     my $ioline = '';
     if ($opt_ioservers) {
@@ -1026 +996 @@
                 HOSTNAME => $io_host, 
                 PORTMAP => $portmap, 
-                STORAGE => $storage, 
-                LOGFILE => $logfile,
-                PUBKEY => $pubkey,
-                PRIVKEY => $privkey};
+                STORAGE => $storage,
+                METASTORAGE => $metastorage, 
+                LOGFILE => $logfile};
         }
     }
@@ -1038 +1007 @@
     my $portmap = shift;
     my $storage = shift;
+    my $metastorage = shift;
     my $logfile = shift;
-    my $pubkey = shift;
-    my $privkey = shift;
     my $metaline = '';
     my @meta_hosts;
@@ -1085 +1053 @@
                 HOSTNAME => $meta_host, 
                 PORTMAP => $portmap, 
-                STORAGE => $storage, 
-                LOGFILE => $logfile,
-                PUBKEY => $pubkey,
-                PRIVKEY => $privkey};
+                STORAGE => $storage,
+                METASTORAGE => $metastorage, 
+                LOGFILE => $logfile};
         }
     }
@@ -1116 +1083 @@
     {
         my $stor = undef;
+        my $mstor = undef;
         my $logf = undef;
         my $proto = undef;
@@ -1126 +1094 @@
             # endpoint.  We want to match on [...]:storage:logfile
             # and place the stuff between the [] in $1, and optionally
-            # place the matched storage path and logfile in $2 and $3 
+            # place the matched storage path and meta path in $2 and $3,
+            # logfile is in $4
             #
             $ep =~ /\[([^\]]+)\](?::([^:]+))?(?::([^:]+))?/;
 
             $stor = $2;
-            $logf = $3;
+            $mstor = $3;
+            $logf = $4;
 
             if(!defined($1))
@@ -1182 +1152 @@
                 HOSTNAME => $hostname, 
                 PORTMAP => \%port, 
-                STORAGE => $stor, 
+                STORAGE => $stor,
+                METASTORAGE => $mstor, 
                 LOGFILE => $logf};
         }
@@ -1229 +1200 @@
             my $pranges = $4;
             $stor = $5;
-            $logf = $6;
+            $mstor = $6;
+            $logf = $7;
 
             if($proto !~ /mx/)
             {
                 $logf = $stor;
-                $stor = $pranges;
+                $stor = $mstor;
+                $mstor = $pranges;
                 $pranges = $branges;
                 $branges = undef;
@@ -1276 +1249 @@
                                 PORTMAP => $portmap, 
                                 STORAGE => $stor, 
+                                METASTORAGE => $mstor,
                                 LOGFILE => $logf};
                         }
@@ -1297 +1271 @@
                                     PORTMAP => $portmap,
                                     STORAGE => $stor,
+                                    METASTORAGE => $mstor,
                                     LOGFILE => $logf};
                             }
@@ -1335 +1310 @@
                                         PORTMAP => $portmap,
                                         STORAGE => $stor,
+                                        METASTORAGE => $mstor,
                                         LOGFILE => $logf};
                                 }
@@ -1456 +1432 @@
     'client-job-timeout=i' => \$opt_client_job_timeout,
     'storage=s'     => \$opt_storage,
-    'pubkey=s'      => \$opt_pubkey,
-    'privkey=s'         => \$opt_privkey,
     'help'          => \$show_help,
     'quiet!'        => \$opt_quiet,
@@ -1526 +1500 @@
     }
     $output_target = \*FILEOUT;
-    $dirname = abs_path(dirname($ARGV[0]));
 }
 
@@ -1554 +1527 @@
 
     $default_storage = get_storage();
+    $default_meta_storage = get_meta_storage();
     $default_logfile = get_logfile();
-    $default_pubkey = get_pubkey();
-    $default_privkey = get_privkey();
-
-    get_ionames($portmap, $default_storage, $default_logfile, $default_pubkey, $default_privkey);
-    get_metanames($portmap, $default_storage, $default_logfile, $default_pubkey, $default_privkey);
+
+    get_ionames($portmap, $default_storage, $default_logfile);
+    get_metanames($portmap, $default_meta_storage, $default_logfile);
 }
 
@@ -1575 +1547 @@
 }
 
+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);
+}
+
 if(needs_default_value(LOGFILE))
 {
@@ -1584 +1566 @@
     set_default_value(LOGFILE, $default_logfile);
     set_default_value(LOGFILE, $default_logfile);
-}
-
-if(needs_default_value(PUBKEY))
-{
-    if(!defined($default_pubkey))
-    {
-        $default_pubkey = get_pubkey();
-    }
-
-    set_default_value(PUBKEY, $default_pubkey);
-    set_default_value(PUBKEY, $default_pubkey);
-}
-
-if(needs_default_value(PRIVKEY))
-{
-    if(!defined($default_pubkey))
-    {
-        $default_privkey = get_privkey();
-    }
-
-    set_default_value(PRIVKEY, $default_privkey);
-    set_default_value(PRIVKEY, $default_privkey);
 }
 

branches/cu-security-branch/src/apps/admin/pvfs2-ls.c

@@ -30 +30 @@
  * is in place to break up large readdirs into multiple operations
  */
-#define MAX_NUM_DIRENTS    113
+/* MAX_NUM_DIRENTS cannot be any larger than PVFS_REQ_LIMIT_LISTATTR */
+#define MAX_NUM_DIRENTS  60
+
+/*
+  Define the maximum length of a single line of output. This is about the 
+  size of 256 maximum path segments, a file name, and attributes.
+ */
+#define ENTRY_MAX          66560
 
 /*
@@ -37 +44 @@
 */
 #define MAX_NUM_PATHS       8
+
+/*
+  Max length of the fully formatted date/time fields
+*/
+#define MAX_TIME_LENGTH    128
+
+/*
+  Length of the formatted date/time for --all-times option
+*/
+#define ALL_TIMES_LENGTH    25
 
 /* optional parameters, filled in by parse_args() */
@@ -52 +69 @@
     int list_no_owner;
     int list_inode;
+    int list_all_times;
     int list_use_si_units;
     char *start[MAX_NUM_PATHS];
@@ -77 +95 @@
     PVFS_sys_attr *attr,
     int attr_error,
-    struct options *opts);
+    struct options *opts,
+    char* entry_buffer);
 
 static int do_list(
@@ -83 +102 @@
     char *start,
     int fs_id,
-    struct options *opts);
+    struct options *opts,
+    char *entry_buffer);
 
 static void print_entry_attr(
@@ -89 +109 @@
     char *entry_name,
     PVFS_sys_attr *attr,
-    struct options *opts);
+    struct options *opts,
+    char *entry_buffer);
 
 #define print_dot_and_dot_dot_info_if_required(refn)        \
@@ -107 +128 @@
         else if (opts->list_long) {                         \
             print_entry(".", refn.handle,                   \
-                        refn.fs_id, NULL, 0, opts);         \
+                        refn.fs_id, NULL, 0, opts,          \
+                        entry_buffer);                      \
             print_entry(".. (faked)", refn.handle,          \
-                        refn.fs_id, NULL, 0, opts);         \
+                        refn.fs_id, NULL, 0, opts,          \
+                        entry_buffer);                      \
         }                                                   \
         else {                                              \
@@ -189 +212 @@
     char *entry_name,
     PVFS_sys_attr *attr,
-    struct options *opts)
+    struct options *opts,
+    char *entry_buffer)
 {
-    char buf[128] = {0}, *formatted_size = NULL;
-    char *formatted_owner = NULL, *formatted_group = NULL;
+    char *formatted_size = NULL;
+    char *formatted_owner = NULL, *formatted_group = NULL, *formatted_time = NULL;
     struct group *grp = NULL;
     struct passwd *pwd = NULL;
@@ -198 +222 @@
     char *owner = empty_str, *group = empty_str;
     char *inode = empty_str;
-    time_t mtime;
-    struct tm *time;    
+    time_t mtime, atime, ctime;
+    struct tm *time;
     PVFS_size size = 0;
-    char scratch_owner[16] = {0}, scratch_group[16] = {0};
+    char scratch_owner[16] = {0}, scratch_group[16] = {0}, scratch_time[MAX_TIME_LENGTH] = {0}, scratch_big_time[MAX_TIME_LENGTH] = {0};
     char scratch_size[16] = {0}, scratch_inode[16] = {0};
     char f_type = '-';
     char group_x_char = '-';
+    int num_bytes = 0;
 
     if (!opts->list_all && (entry_name[0] == '.'))
@@ -214 +239 @@
         return;
     }
+
     mtime = (time_t)attr->mtime;
     time = localtime(&mtime);
+    if(opts->list_all_times)
+    {
+        atime = (time_t)attr->atime;
+        ctime = (time_t)attr->ctime;
+
+        num_bytes = strftime( scratch_time,ALL_TIMES_LENGTH+1,"%F %H:%M:%S %z",time );
+        strncpy(scratch_big_time,scratch_time,num_bytes);
+
+        time = localtime(&atime);
+        num_bytes = strftime( scratch_time,ALL_TIMES_LENGTH+3,"  %F %H:%M:%S %z",time );
+        strncat(scratch_big_time,scratch_time,num_bytes);
+
+        time = localtime(&ctime);
+        num_bytes = strftime( scratch_time,ALL_TIMES_LENGTH+3,"  %F %H:%M:%S %z",time );
+        strncat(scratch_big_time,scratch_time,num_bytes);
+
+        format_size_string(scratch_big_time,strlen(scratch_big_time),&formatted_time,0,1);
+    }
+    else
+    {
+        strftime( scratch_time,17,"%F %H:%M",time );
+        format_size_string(scratch_time,16,&formatted_time,0,1);
+    }
 
     snprintf(scratch_owner,16,"%d",(int)attr->owner);
@@ -302 +351 @@
     }
 
-    snprintf(buf,128,"%s%c%c%c%c%c%c%c%c%c%c    1 %s %s %s "
-             "%.4d-%.2d-%.2d %.2d:%.2d %s",
+    snprintf(entry_buffer,ENTRY_MAX,"%s%c%c%c%c%c%c%c%c%c%c    1 %s %s %s "
+             "%s %s",
              inode,
              f_type,
@@ -318 +367 @@
              formatted_group,
              formatted_size,
-             (time->tm_year + 1900),
-             (time->tm_mon + 1),
-             time->tm_mday,
-             (time->tm_hour),
-             (time->tm_min),
+             formatted_time,
              entry_name);
 
@@ -337 +382 @@
         free(formatted_group);
     }
+    if (formatted_time)
+    {
+        free(formatted_time);
+    }
 
     if (attr->objtype == PVFS_TYPE_SYMLINK)
@@ -344 +393 @@
         if (opts->list_long)
         {
-            printf("%s -> %s\n", buf, attr->link_target);
+            printf("%s -> %s\n", entry_buffer, attr->link_target);
         }
         else
         {
-            printf("%s\n",buf);
+            printf("%s\n",entry_buffer);
         }
     }
     else
     {
-        printf("%s\n",buf);
+        printf("%s\n",entry_buffer);
     }
 }
@@ -363 +412 @@
     PVFS_sys_attr *attr,
     int attr_error,
-    struct options *opts)
+    struct options *opts,
+    char *entry_buffer)
 {
     int ret = -1;
@@ -410 +460 @@
                 return;
             }
-            print_entry_attr(handle, entry_name,  &getattr_response.attr, opts);
+            print_entry_attr(handle, entry_name,  &getattr_response.attr, opts, entry_buffer);
         }
         else
         {
-            print_entry_attr(handle, entry_name, attr, opts);
+            print_entry_attr(handle, entry_name, attr, opts, entry_buffer);
         }
     }
@@ -430 +480 @@
     char *start,
     int fs_id,
-    struct options *opts)
+    struct options *opts,
+    char *entry_buffer)
 {
     int i = 0, printed_dot_info = 0;
@@ -504 +555 @@
             {
                 print_entry_attr(ref.handle, segment,
-                                 &getattr_response.attr, opts);
+                                 &getattr_response.attr, opts, entry_buffer);
             }
             else
@@ -511 +562 @@
                         NULL,
                         0,
-                        opts);
+                        opts, entry_buffer);
             }
             return 0;
@@ -568 +619 @@
                     &rdplus_response.attr_array[i],
                     rdplus_response.stat_err_array[i],
-                    opts);
+                    opts, entry_buffer);
 
             PVFS_sys_attr *attr = &rdplus_response.attr_array[i];
@@ -649 +700 @@
         {
             printf("\n");
-            do_list(full_path,current->path,fs_id,opts);
+            do_list(full_path,current->path,fs_id,opts,entry_buffer);
             current = current->next;
             free(head->path);
@@ -685 +736 @@
         {"inode",0,0,0},
         {"size",0,0,0},
+        {"all-times",0,0,0},
         {0,0,0,0}
     };
@@ -753 +805 @@
                 {
                     goto list_inode;
+                }
+                else if (strcmp("all-times", cur_option) == 0)
+                {
+                    goto list_all_times;
                 }
                 else
@@ -805 +861 @@
                 tmp_opts->list_inode = 1;
                 break;
+          list_all_times:
+                tmp_opts->list_all_times = 1;
+                break;
             case 't':
                 do_timing = 1;
@@ -854 +913 @@
     fprintf(stderr,"  -n, --numeric-uid-gid      like -l, but list "
             "numeric UIDs and GIDs\n");
+    fprintf(stderr,"      --all-times            display atime, mtime,"
+            " and ctime information\n");
     fprintf(stderr,"  -o                         like -l, but do not "
             "list group information\n");
@@ -876 +937 @@
     char current_dir[PVFS_NAME_MAX] = {0};
     int found_one = 0;
+    char *entry_buffer = malloc(ENTRY_MAX);
 
     process_name = argv[0];
-
     user_opts = parse_args(argc, argv);
     if (!user_opts)
@@ -969 +1030 @@
         else /* Root directory case has nothing to match */
         {
-            substr = &user_opts->start[i][strlen(user_opts->start[i])-1];
-        }
-
-        while (index != substr)
+            substr = &user_opts->start[i][strlen(user_opts->start[i])];
+        }
+
+
+        while ((index != substr) && (substr != NULL))
         {
             index++;
             j++;
         }
-        user_opts->start[i][j] = '\0';
-
-        do_list(user_opts->start[i], pvfs_path[i], fs_id_array[i], user_opts);
+
+        user_opts->start[i][++j] = '\0';
+
+        do_list(user_opts->start[i], pvfs_path[i], fs_id_array[i], user_opts, entry_buffer);
 
         if (user_opts->num_starts > 1)
@@ -989 +1052 @@
     PVFS_sys_finalize();
     free(user_opts);
+    free(entry_buffer);
 
     return(ret);

branches/cu-security-branch/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* storage_space, TROVE_coll_id coll_id, char* coll_name,
+    char* meta_storage_space, TROVE_coll_id coll_id, char* coll_name,
     char* ver_string, int ver_string_max);
-static int remove_collection_entry(char* storage_space, char* collname);
+static int remove_collection_entry(char* meta_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* storage_space, TROVE_coll_id coll_id, 
+    char* meta_storage_space, TROVE_coll_id coll_id, 
     char* ver_string, int ver_string_max);
 static int translate_0_0_1(
-    char* storage_space, char* old_coll_path, 
+    char* data_storage_space, char* meta_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* storage_space, char* old_coll_path, 
+    char* data_storage_space, char* old_coll_path, 
     TROVE_coll_id coll_id, char* coll_name,
     TROVE_context_id trove_context);
@@ -234 +234 @@
         (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->storage_path, 
+        server_config->meta_path, 
         fs_config->coll_id, 
         fs_config->file_system_name,
@@ -254 +259 @@
     {
         sprintf(old_coll_path, "%s/%08x-old-%s",
-                server_config->storage_path, 
+                server_config->meta_path, 
                 fs_config->coll_id, version);
 
@@ -293 +298 @@
 
         ret = translate_0_0_1(
-            server_config->storage_path, old_coll_path, 
+            server_config->data_path, 
+            server_config->meta_path,
+            old_coll_path, 
             fs_config->file_system_name, 
             fs_config->coll_id);
@@ -328 +335 @@
              * is anymore
              */
-            DIR * storage_dir;
+            DIR * data_storage_dir;
+            DIR * meta_storage_dir;
             struct dirent * next_dirent;
             char collname[PATH_MAX];
@@ -336 +344 @@
             collname_length = sprintf(collname, "%08x-old", fs_config->coll_id);
 
-            storage_dir = opendir(server_config->storage_path);
-            if(!storage_dir)
-            {
-                fprintf(stderr, "Error: failed to open directory: %s\n",
-                        server_config->storage_path);
+            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);
                 return -1;
             }
 
-            while((next_dirent = readdir(storage_dir)) != NULL)
+            while((next_dirent = readdir(data_storage_dir)) != NULL)
             {
                 int d_namelen = strlen(next_dirent->d_name);
@@ -353 +361 @@
 
                     sprintf(old_coll_path, "%s/%s",
-                            server_config->storage_path, next_dirent->d_name);
+                            server_config->data_path, next_dirent->d_name);
 
                     /* found an old version, delete it */
@@ -366 +374 @@
                             "Error: failed to remove old collection at: %s\n",
                             old_coll_path);
-                        closedir(storage_dir);
+                        closedir(data_storage_dir);
                         return -1;
                     }
@@ -373 +381 @@
             }
 
+            /* 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)
             {
@@ -380 +430 @@
             }
 
-            closedir(storage_dir);
+            closedir(data_storage_dir);
         }
         else
@@ -527 +577 @@
  */
 static int src_get_version(
-    char* storage_space,       /**< path to storage space */
+    char* meta_storage_space,       /**< path to storage space */
     TROVE_coll_id coll_id,     /**< collection id */
     char* coll_name,           /**< collection name */
@@ -537 +587 @@
 
     ret = src_get_version_0_0_1(
-        storage_space, coll_id, ver_string, ver_string_max);
+        meta_storage_space, coll_id, ver_string, ver_string_max);
 
     if(ret != 0)
@@ -544 +594 @@
                 "Error: all known collection version checks "
                 "failed for \ncollection %s (%08x) in storage space %s\n", 
-                coll_name, coll_id, storage_space);
+                coll_name, coll_id, meta_storage_space);
     }
 
@@ -556 +606 @@
  */
 static int src_get_version_0_0_1(
-    char* storage_space,   /**< path to storage space */
+    char* meta_storage_space,   /**< path to storage space */
     TROVE_coll_id coll_id, /**< collection id */
     char* ver_string,      /**< version in string format */
@@ -567 +617 @@
 
     sprintf(coll_db, "%s/%08x/collection_attributes.db", 
-            storage_space, coll_id);
+            meta_storage_space, coll_id);
 
     /* try to find a collections db */
@@ -630 +680 @@
  */
 static int translate_0_0_1(
-    char* storage_space,   /**< path to storage space */
+    char* data_storage_space,   /**< path to data storage space */
+    char* meta_storage_space, /**< path to metadata storage space */
     char* old_coll_path,   /**< path to old collection */
     char* coll_name,       /**< collection name */
@@ -645 +696 @@
 
     /* rename old collection */
-    snprintf(current_path, PATH_MAX, "%s/%08x", storage_space, coll_id);
+    snprintf(current_path, PATH_MAX, "%s/%08x", meta_storage_space, coll_id);
 
     if(access(current_path, F_OK) != 0)
@@ -664 +715 @@
     }
 
-    ret = remove_collection_entry(storage_space, coll_name);
+    ret = remove_collection_entry(meta_storage_space, coll_name);
     if(ret < 0)
     {
@@ -679 +730 @@
         printf("VERBOSE Creating temporary collection to migrate to.\n");
     ret = pvfs2_mkspace(
-        storage_space, 
+        data_storage_space,
+        meta_storage_space,
         coll_name,
         coll_id, 
@@ -700 +752 @@
         PVFS_perror("PINT_dist_initialize", ret);
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -706 +758 @@
     /* initialize trove and lookup collection */
     ret = trove_initialize(
-        TROVE_METHOD_DBPF, NULL, storage_space, 0);
+        TROVE_METHOD_DBPF, NULL, data_storage_space, meta_storage_space,0);
     if (ret < 0)
     {
         PVFS_perror("trove_initialize", ret);
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -720 +772 @@
         fprintf(stderr, "Error: failed to lookup new collection.\n");
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
         return -1; 
     }   
@@ -738 +790 @@
         fprintf(stderr, "Error: failed to migrate collection extended attributes.\n");
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -749 +801 @@
         fprintf(stderr, "Error: failed to migrate dspace attributes.\n");
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -760 +812 @@
         fprintf(stderr, "Error: failed to migrate keyvals.\n");
         if(verbose) printf("VERBOSE Destroying temporary collection.\n");
-        pvfs2_rmspace(storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -771 +823 @@
     /* convert bstreams */
     ret = translate_bstreams_0_0_1(
-        storage_space, old_coll_path, coll_id, coll_name, trove_context);
+        data_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(storage_space, coll_name, coll_id, 1, 0);
+        pvfs2_rmspace(data_storage_space, meta_storage_space, coll_name, coll_id, 1, 0);
         return(-1);
     }
@@ -795 +847 @@
 }
 
-static int remove_collection_entry(char* storage_space, char* collname)
+static int remove_collection_entry(char* meta_storage_space, char* collname)
 {
     char collections_db[PATH_MAX];
@@ -803 +855 @@
     TROVE_coll_id coll_id;
 
-    sprintf(collections_db, "%s/collections.db", storage_space);
+    sprintf(collections_db, "%s/collections.db", meta_storage_space);
 
     ret = access(collections_db, F_OK);
@@ -1494 +1546 @@
  */
 static int translate_bstreams_0_0_1(
-    char* storage_space,            /**< path to trove storage space */
+    char* data_storage_space,            /**< path to trove storage space */
     char* old_coll_path,            /**< path to old collection */
     TROVE_coll_id coll_id,          /**< collection id */
@@ -1531 +1583 @@
                     old_coll_path, i, tmp_ent->d_name);
                 snprintf(new_bstream_file, PATH_MAX, "%s/%08x/bstreams/%.8d/%s",
-                    storage_space, coll_id, i, tmp_ent->d_name);
+                    data_storage_space, coll_id, i, tmp_ent->d_name);
                 /* hard link to new location */
                 ret = link(bstream_file, new_bstream_file);

branches/cu-security-branch/src/apps/admin/pvfs2-mkspace.c

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

branches/cu-security-branch/src/apps/admin/pvfs2-showcoll.c

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

branches/cu-security-branch/src/apps/admin/pvfs2-stat.c

@@ -55 +55 @@
 {
    int               ret          = -1,
+                     ret_agg      =  0,
                      i            =  0;
    char           ** ppszPvfsPath = NULL;
@@ -151 +152 @@
          fprintf(stderr, "Error stating [%s]\n", user_opts.pszFiles[i]);
       }
+      ret_agg |= ret;
    }
 
@@ -179 +181 @@
    }
 
-   return(0);
+   return(ret_agg);
 }
 
@@ -478 +480 @@
       fprintf(stdout, "  datafiles     : %d\n", attr->dfile_count);
    }
+
+   if( (attr->mask & PVFS_ATTR_SYS_BLKSIZE) &&
+       (attr->objtype == PVFS_TYPE_METAFILE))
+   {
+      fprintf(stdout, "  blksize       : %lld\n", lld(attr->blksize));
+   }
+
    /* dirent_count is only valid on directories */
    if( (attr->mask & PVFS_ATTR_SYS_DIRENT_COUNT) &&

branches/cu-security-branch/src/apps/admin/pvfs2-xattr.c

@@ -3 +3 @@
  * 
  * See COPYING in top-level directory.
+ *
+ * 03/19/07 - Added set and get for user.pvfs2.mirror.mode and ..mirror.copies.
+ *            Added get for user.pvfs2.mirror.handles and ..mirror.status
  */
 
@@ -26 +29 @@
 #include "xattr-utils.h"
 
+#include "pvfs2-mirror.h"
+
 #define VALBUFSZ 1024
 
@@ -41 +46 @@
 struct options
 {
-    PVFS_ds_keyval key;
-    PVFS_ds_keyval val;
+    PVFS_ds_keyval *key;
+    PVFS_ds_keyval *val;
     char* srcfile;
-    int get, text;
+    int get, text, key_count;
 };
 
@@ -78 +83 @@
 static struct options* parse_args(int argc, char* argv[]);
 static int generic_open(file_object *obj, PVFS_credential *credentials);
-static int pvfs2_eattr(int get, file_object *, PVFS_ds_keyval *key_p,
-        PVFS_ds_keyval *val_p, PVFS_credential *creds);
+
+static int pvfs2_eattr(int get
+                      ,file_object      *obj
+                      ,PVFS_ds_keyval   *key_p
+                      ,PVFS_ds_keyval   *val_p
+                      ,PVFS_credential  *creds
+                      ,int key_count); 
+
 static void usage(int argc, char** argv);
 static int resolve_filename(file_object *obj, char *filename);
@@ -92 +103 @@
   file_object src;
   PVFS_credential credentials;
+  int i;
 
   memset(&src, 0, sizeof(src));
@@ -124 +136 @@
       return -1;
   }
-  if (!eattr_is_prefixed(user_opts->key.buffer))
+
+  if (!eattr_is_prefixed(user_opts->key[0].buffer))
   {
-      fprintf(stderr, "extended attribute key is not prefixed %s\n", (char *) user_opts->key.buffer);
+      fprintf(stderr, "extended attribute key is not prefixed %s\n"
+                    , (char *) user_opts->key[0].buffer);
       return -1;
   }
   if (!user_opts->get)
   {
-      if (!permit_set(&user_opts->key))
+      if (!permit_set(&user_opts->key[0]))
       {
-          fprintf(stderr, "Not permitted to set key %s\n", (char *) user_opts->key.buffer);
+          fprintf(stderr, "Not permitted to set key %s\n"
+                        , (char *) user_opts->key[0].buffer);
           return -1;
       }
-      if (modify_val(&user_opts->key, &user_opts->val) < 0)
+      if (modify_val(&user_opts->key[0], &user_opts->val[0]) < 0)
       {
-          fprintf(stderr, "Invalid value for user-settable hint %s, %s\n", (char *) user_opts->key.buffer, (char *) user_opts->val.buffer);
+          fprintf(stderr, "Invalid value for user-settable attribute %s, %s\n"
+                        , (char *) user_opts->key[0].buffer
+                        , (char *) user_opts->val[0].buffer);
           return -1;
       }
   }
 
-    ret = pvfs2_eattr(user_opts->get, &src, &user_opts->key, &user_opts->val, &credentials);
+    ret = pvfs2_eattr(user_opts->get
+                     ,&src
+                     ,user_opts->key
+                     ,user_opts->val
+                     ,&credentials
+                     ,user_opts->key_count);
     if (ret != 0) 
     {
@@ -150 +172 @@
     if (user_opts->get && user_opts->text)  
     {
-        if (strncmp(user_opts->key.buffer, "user.pvfs2.meta_hint", SPECIAL_METAFILE_HINT_KEYLEN) == 0) {
-            PVFS_metafile_hint *hint = (PVFS_metafile_hint *) user_opts->val.buffer;
-            printf("Metafile hints: ");
+        if (strncmp(user_opts->key[0].buffer
+                   ,"user.pvfs2.meta_hint"
+                   ,SPECIAL_METAFILE_HINT_KEYLEN) == 0) {
+            PVFS_metafile_hint *hint = 
+                            (PVFS_metafile_hint *) user_opts->val[0].buffer;
+            printf("Metafile hints (0x%08x)",(unsigned int)hint->flags);
             if (hint->flags & PVFS_IMMUTABLE_FL) {
-                printf("immutable file ");
+                printf(" :immutable file ");
             }
             if (hint->flags & PVFS_APPEND_FL) {
-                printf("Append-only file ");
+                printf(" :Append-only file ");
             }
             if (hint->flags & PVFS_NOATIME_FL) {
-                printf("Atime updates disabled.");
+                printf(" :Atime updates disabled");
+            }
+            if (hint->flags & PVFS_MIRROR_FL) {
+                printf("  :Mirroring is enabled");
             }
             printf("\n");
+        } else if ( strncmp(user_opts->key[0].buffer
+                           ,"user.pvfs2.mirror.handles"
+                           ,sizeof("user.pvfs2.mirror.handles")) == 0)
+        {
+             PVFS_handle *myHandles = (PVFS_handle *)user_opts->val[0].buffer;
+             int copies = *(int *)user_opts->val[1].buffer;
+             int dfile_count = src.u.pvfs2.attr.dfile_count;
+             for (i=0; i<(copies * dfile_count); i++)
+             {
+                 printf("Handle(%d):%llu\n",i,llu(myHandles[i]));
+             }
+        } else if ( strncmp(user_opts->key[0].buffer
+                           ,"user.pvfs2.mirror.copies"
+                           ,sizeof("user.pvfs2.mirror.copies")) == 0)
+        {
+             int *myCopies = (int *)user_opts->val[0].buffer;
+             printf("Number of Mirrored Copies : %d\n",*myCopies);
+        } else if ( strncmp(user_opts->key[0].buffer
+                           ,"user.pvfs2.mirror.status"
+                           ,sizeof("user.pvfs2.mirror.status")) == 0)
+        {
+             int copies = *(int *)user_opts->val[1].buffer;
+             int dfile_count = src.u.pvfs2.attr.dfile_count;
+             PVFS_handle *status = (PVFS_handle *)user_opts->val[0].buffer;
+             for (i=0; i<(dfile_count * copies); i++)
+                 printf("src handle(%d) : status(%s) : value(%llu)\n"
+                       ,i
+                       ,status[i]==0?"usable":"UNusable"
+                       ,llu(status[i]));
+        } else if ( strncmp(user_opts->key[0].buffer
+                           ,"user.pvfs2.mirror.mode"
+                           , sizeof("user.pvfs2.mirror.mode")) == 0)
+        {
+             printf("Mirroring Mode : ");
+             switch(*(MIRROR_MODE *)user_opts->val[0].buffer)
+             {
+                case NO_MIRRORING :
+                {
+                    printf("Turned OFF\n");
+                    break;
+                }
+                case MIRROR_ON_IMMUTABLE :
+                {
+                    printf("Create Mirror when IMMUTABLE is set\n");
+                    break;
+                }
+                default:
+                {
+                    printf("Unknown mode(%d)\n"
+                          ,*(int *)user_opts->val[0].buffer);
+                    break;
+                }
+             }/*end switch*/
         } else {
-            printf("key:%s Value:\n%s\n",
-                    (char *)user_opts->key.buffer,
-                    (char *)user_opts->val.buffer);
+            printf("key : \"%s\" \tValue : \"%s\"\n",
+                    (char *)user_opts->key[0].buffer,
+                    (char *)user_opts->val[0].buffer);
         }
     }
@@ -175 +256 @@
 static int modify_val(PVFS_ds_keyval *key_p, PVFS_ds_keyval *val_p)
 {
-    if (strncmp(key_p->buffer, "user.pvfs2.meta_hint", SPECIAL_METAFILE_HINT_KEYLEN) == 0)
+    if (strncmp(key_p->buffer,"user.pvfs2.meta_hint"
+                             , SPECIAL_METAFILE_HINT_KEYLEN) == 0)
     {
         PVFS_metafile_hint hint;
@@ -195 +277 @@
         memcpy(val_p->buffer, &hint, sizeof(hint));
         val_p->buffer_sz = sizeof(hint);
-    }
+    } else if (strncmp(key_p->buffer,"user.pvfs2.mirror.mode"
+                                    ,sizeof("user.pvfs2.mirror.mode")) == 0)
+    {
+       printf("Setting mirror mode to %d\n",*(int *)val_p->buffer);
+    } else if (strncmp(key_p->buffer,"user.pvfs2.mirror.copies"
+                                    ,sizeof("user.pvfs2.mirror.mode")) == 0)
+    {
+       printf("Setting number of mirrored copies to %d\n"
+             ,*(int *)val_p->buffer);
+    }
+
+
     return 0;
 }
@@ -214 +307 @@
  * returns zero on success and negative one on failure
  */
-static int pvfs2_eattr(int get, file_object *obj, PVFS_ds_keyval *key_p,
-        PVFS_ds_keyval *val_p, PVFS_credential *creds) 
+static int pvfs2_eattr(int get
+                      ,file_object      *obj
+                      ,PVFS_ds_keyval   *key_p
+                      ,PVFS_ds_keyval   *val_p
+                      ,PVFS_credential  *creds
+                      ,int key_count) 
 {
   int ret = -1;
@@ -224 +321 @@
       {
 #ifndef HAVE_FGETXATTR_EXTRA_ARGS
-        if ((ret = fgetxattr(obj->u.ufs.fd, key_p->buffer, val_p->buffer, val_p->buffer_sz)) < 0)
+        if ((ret = fgetxattr(obj->u.ufs.fd
+                            ,key_p->buffer
+                            ,val_p->buffer
+                            ,val_p->buffer_sz)) < 0)
 #else
-        if ((ret = fgetxattr(obj->u.ufs.fd, key_p->buffer, val_p->buffer, val_p->buffer_sz, 0, 0)) < 0)
+        if ((ret = fgetxattr(obj->u.ufs.fd
+                            ,key_p->buffer
+                            ,val_p->buffer
+                            ,val_p->buffer_sz 
+                            ,0
+                            ,0)) < 0)
 #endif
         {
@@ -253 +358 @@
   else
   {
-      if (get == 1)
+      if (get == 1 && key_count == 1)
       {
           ret = PVFS_sys_geteattr(obj->u.pvfs2.ref, creds, key_p, val_p, NULL);
-      }
-      else {
+      } else if (get == 1 && key_count == 2)
+      {
+          PVFS_sysresp_geteattr *resp = malloc(sizeof(*resp));
+          if (!resp)
+          {
+             fprintf(stderr,"Unable to allocate resp structure.\n");
+             exit(EXIT_FAILURE);
+          }
+          memset(resp,0,sizeof(*resp));
+          resp->val_array = val_p;
+          resp->err_array = malloc(2 * sizeof(PVFS_error));
+          if (!resp->err_array)
+          {
+             fprintf(stderr,"Unable to allocate err_array.\n");
+             exit(EXIT_FAILURE);
+          }
+          memset(resp->err_array,0,sizeof(2 * sizeof(PVFS_error)));
+          
+          ret = PVFS_sys_geteattr_list(obj->u.pvfs2.ref
+                                      ,creds
+                                      ,key_count
+                                      ,key_p
+                                      ,resp
+                                      ,NULL );
+      } else {
           ret = PVFS_sys_seteattr(obj->u.pvfs2.ref, creds, key_p, val_p, 0, NULL);
       }
@@ -291 +419 @@
     memset(tmp_opts, 0, sizeof(struct options));
 
+    /*create one key structure*/
+    tmp_opts->key = malloc(sizeof(PVFS_ds_keyval));
+    if (!tmp_opts->key)
+    {
+        fprintf(stderr,"Unable to allocate tmp_opts->key.\n");
+        exit(EXIT_FAILURE);
+    }
+    memset(tmp_opts->key,0,sizeof(PVFS_ds_keyval));
+
+    /*create one val structure*/
+    tmp_opts->val = malloc(sizeof(PVFS_ds_keyval));
+    if (!tmp_opts->val)
+    {
+        fprintf(stderr,"Unable to allocate tmp_opts->val.\n");
+        exit(EXIT_FAILURE);
+    }
+    memset(tmp_opts->val,0,sizeof(PVFS_ds_keyval));
+
+    /*set default key_count*/
+    tmp_opts->key_count = 1;
+
     /* fill in defaults */
-    memset(&tmp_opts->key, 0, sizeof(PVFS_ds_keyval));
-    memset(&tmp_opts->val, 0, sizeof(PVFS_ds_keyval));
     tmp_opts->srcfile = strdup(argv[argc-1]);
     tmp_opts->get = 1;
@@ -308 +455 @@
                 break;
             case 'k':
-                tmp_opts->key.buffer = strdup(optarg);
-                tmp_opts->key.buffer_sz = strlen(tmp_opts->key.buffer) + 1;
+                tmp_opts->key[0].buffer = strdup(optarg);
+                tmp_opts->key[0].buffer_sz = strlen(tmp_opts->key[0].buffer) + 1;
                 break;
             case 'v':
-                tmp_opts->val.buffer = strdup(optarg);
-                tmp_opts->val.buffer_sz = strlen(tmp_opts->val.buffer) + 1;
-                break;
+                if (strncmp(tmp_opts->key[0].buffer
+                           ,"user.pvfs2.mirror.mode"
+                           ,sizeof("user.pvfs2.mirror.mode")) == 0 ||
+                    strncmp(tmp_opts->key[0].buffer
+                           ,"user.pvfs2.mirror.copies"
+                           ,sizeof("user.pvfs2.mirror.copies")) == 0)
+                { /*convert string argument into numeric argument*/
+                  tmp_opts->val[0].buffer = malloc(sizeof(int));
+                  if (!tmp_opts->val[0].buffer)
+                  {
+                     printf("Unable to allocate memory for key value.\n");
+                     exit(EXIT_FAILURE);
+                  }
+                  memset(tmp_opts->val[0].buffer,0,sizeof(int));
+                  *(int *)tmp_opts->val[0].buffer = atoi(optarg);
+                  tmp_opts->val[0].buffer_sz = sizeof(int);
+                  break;
+                } else {
+                  tmp_opts->val[0].buffer = strdup(optarg);
+                  tmp_opts->val[0].buffer_sz = strlen(tmp_opts->val[0].buffer);
+                  break;
+                }
             case('?'):
                 printf("?\n");
@@ -321 +487 @@
         }
     }
+    /*ensure that the given mode is supported by PVFS*/
+    if (!tmp_opts->get &&
+         strcmp(tmp_opts->key[0].buffer,"user.pvfs2.mirror.mode") == 0)
+    {
+       if (*(int *)tmp_opts->val[0].buffer < BEGIN_MIRROR_MODE ||
+           *(int *)tmp_opts->val[0].buffer > END_MIRROR_MODE )
+       {
+          fprintf(stderr,"Invalid Mirror Mode ==> %d\n"
+                         "\tValid Modes\n"
+                         "\t1. %d == No Mirroring\n"
+                         "\t2. %d == Mirroring on Immutable\n"
+                        ,*(int *)tmp_opts->val[0].buffer
+                        ,NO_MIRRORING,MIRROR_ON_IMMUTABLE);
+
+          exit(EXIT_FAILURE);
+       }
+    }
+
     if (tmp_opts->get == 1)
     {
-        tmp_opts->val.buffer = calloc(1, VALBUFSZ);
-        tmp_opts->val.buffer_sz = VALBUFSZ;
-        if (tmp_opts->val.buffer == NULL)
-        {
-            fprintf(stderr, "Could not allocate val\n");
-            exit(EXIT_FAILURE);
-        }
-    }
-    else {
-        if (tmp_opts->val.buffer == NULL)
-        {
-            fprintf(stderr, "Please specify value if setting extended attributes\n");
+        /*if user wants mirror.handles or mirror.status, then we must also */
+        /*retrieve the number of copies, so we know how to display the     */
+        /*information properly.                                            */
+        if (strcmp(tmp_opts->key[0].buffer,"user.pvfs2.mirror.handles") == 0 ||
+            strcmp(tmp_opts->key[0].buffer,"user.pvfs2.mirror.status") == 0 )
+        {
+           tmp_opts->key_count = 2;
+           PVFS_ds_keyval *myKeys = malloc(tmp_opts->key_count * 
+                                           sizeof(PVFS_ds_keyval));
+           if (!myKeys)
+           {
+               fprintf(stderr,"Unable to allocate myKeys.\n");
+               exit(EXIT_FAILURE);
+           }
+           memset(myKeys,0,sizeof(tmp_opts->key_count *
+                                  sizeof(PVFS_ds_keyval)));
+           myKeys[0] = *tmp_opts->key;
+           myKeys[1].buffer = strdup("user.pvfs2.mirror.copies");
+           myKeys[1].buffer_sz = sizeof("user.pvfs2.mirror.copies");
+           free(tmp_opts->key);
+           tmp_opts->key = myKeys;
+        }/*end if handles or status*/
+
+        
+
+        tmp_opts->val[0].buffer = calloc(1, VALBUFSZ);
+        if (!tmp_opts->val[0].buffer)
+        {
+           fprintf(stderr,"Unable to allocate tmp_opts->val[0].buffer.\n");
+           exit(EXIT_FAILURE);
+        }
+        tmp_opts->val[0].buffer_sz = VALBUFSZ;
+        
+        if (tmp_opts->key_count == 2)
+        {
+           PVFS_ds_keyval *myVals = malloc(tmp_opts->key_count * 
+                                           sizeof(PVFS_ds_keyval));
+           if (!myVals)
+           {
+               fprintf(stderr,"Unable to allocate myVals.\n");
+               exit(EXIT_FAILURE);
+           }
+           memset(myVals,0,sizeof(tmp_opts->key_count *
+                                  sizeof(PVFS_ds_keyval)));
+           myVals[0] = *tmp_opts->val;
+           free(tmp_opts->val);
+
+           myVals[1].buffer = malloc(sizeof(int));
+           if (!myVals[1].buffer)
+           {
+              fprintf(stderr,"Unable to allocate myVals[1].buffer.\n");
+              exit(EXIT_FAILURE);
+           }
+           myVals[1].buffer_sz = sizeof(int);
+           tmp_opts->val = myVals;
+         }/*end if*/  
+    } else {
+        if (tmp_opts->val[0].buffer == NULL)
+        {
+            fprintf(stderr, "Please specify value if setting extended "
+                            "attributes\n");
             usage(argc, argv);
             exit(EXIT_FAILURE);
         }
     }
-    if (tmp_opts->key.buffer == NULL)
+    if (tmp_opts->key[0].buffer == NULL)
     {
         fprintf(stderr, "Please specify key if getting extended attributes\n");
@@ -351 +584 @@
 static void usage(int argc, char** argv)
 {
-    fprintf(stderr,"Usage: %s -s {set xattrs} -k <key> -v <val> -t {print attributes} filename\n",argv[0]);
+    fprintf(stderr,"Usage: %s -s {set xattrs} -k <key> -v <val> "
+                   "-t {print attributes} filename\n",argv[0]);
     return;
 }
@@ -450 +684 @@
         memcpy(&obj->u.pvfs2.attr, &resp_getattr.attr,
                sizeof(PVFS_sys_attr));
-        obj->u.pvfs2.attr.mask = PVFS_ATTR_SYS_ALL_SETABLE;
+        /* we should not modify the returned mask, so we know which data fields
+         * in the attribute structure are valid.  I don't see any reason why
+         * it is being reset here.
+        */
+        //obj->u.pvfs2.attr.mask = PVFS_ATTR_SYS_ALL_SETABLE;
         obj->u.pvfs2.ref = ref;
     }

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk