Changeset 8960

Timestamp:

07/15/11 23:22:50 (23 months ago)

Author:

mtmoore

Message:

client/server builds, much to fix

Location:

branches/orange-next

Files:

• include/pvfs2-mgmt.h (modified) (3 diffs)
• src/apps/admin/pvfs2-check-config.c (modified) (2 diffs)
• src/apps/admin/pvfs2-fs-dump.c (modified) (4 diffs)
• src/apps/admin/pvfs2-fsck.c (modified) (2 diffs)
• src/apps/admin/pvfs2-migrate-collection.c (modified) (2 diffs)
• src/apps/admin/pvfs2-mkspace.c (modified) (1 diff)
• src/apps/admin/pvfs2-perf-mon-example.c (modified) (14 diffs)
• src/apps/admin/pvfs2-ping.c (modified) (9 diffs)
• src/apps/karma/comm.c (modified) (6 diffs)
• src/client/sysint/fs-add.sm (modified) (5 diffs)
• src/client/sysint/mgmt-get-config.c (modified) (2 diffs)
• src/client/sysint/mgmt-misc.c (modified) (8 diffs)
• src/client/sysint/mgmt-statfs-list.sm (modified) (1 diff)
• src/client/sysint/sys-create.sm (modified) (4 diffs)
• src/client/sysint/sys-mkdir.sm (modified) (3 diffs)
• src/client/sysint/sys-statfs.sm (modified) (2 diffs)
• src/client/sysint/sys-symlink.sm (modified) (3 diffs)
• src/common/misc/fsck-utils.c (modified) (8 diffs)
• src/common/misc/pint-cached-config.c (modified) (1 diff)
• src/common/misc/server-config.c (modified) (3 diffs)
• src/common/misc/server-config.h (modified) (4 diffs)
• src/server/create.sm (modified) (3 diffs)
• src/server/unstuff.sm (modified) (1 diff)

branches/orange-next/include/pvfs2-mgmt.h

@@ -121 +121 @@
     PVFS_fs_id fs_id,
     PVFS_credentials *credentials,
-    int server_type,
     int *count);
 
@@ -127 +126 @@
     PVFS_fs_id fs_id,
     PVFS_credentials *credentials,
-    int server_type,
     PVFS_BMI_addr_t *addr_array,
     int *inout_count_p);
@@ -148 +146 @@
     PVFS_fs_id fs_id,
     PVFS_credentials *credentials,
-    PVFS_BMI_addr_t addr,
-    int* server_type);
+    PVFS_BMI_addr_t addr);
 
 PVFS_error PVFS_imgmt_setparam_list(

branches/orange-next/src/apps/admin/pvfs2-check-config.c

@@ -158 +158 @@
             fs_id = mnt->mntent_array[i].fs_id;
             
-            /* Retrieve the list of all servers for the fs id*/
-            rc = PVFS_mgmt_count_servers(fs_id, &creds, PVFS_MGMT_IO_SERVER,
-                                         &server_count);
+            /* Retrieve the list of all servers for the fs id */
+            rc = PVFS_mgmt_count_servers(fs_id, &creds, &server_count);
 
             if (0 != rc)
@@ -168 +167 @@
             }
             server_addrs = malloc(server_count * sizeof(PVFS_BMI_addr_t));
-            rc = PVFS_mgmt_get_server_array(fs_id, &creds, PVFS_MGMT_IO_SERVER,
+            rc = PVFS_mgmt_get_server_array(fs_id, &creds,
                                             server_addrs, &server_count);
             if (0 != rc)

branches/orange-next/src/apps/admin/pvfs2-fs-dump.c

@@ -142 +142 @@
 
     /* count how many servers we have */
-    ret = PVFS_mgmt_count_servers(cur_fs, &creds, 
-        PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
-        &server_count);
+    ret = PVFS_mgmt_count_servers(cur_fs, &creds, &server_count);
     if (ret != 0)
     {
@@ -159 +157 @@
         return -1;
     }
-    ret = PVFS_mgmt_get_server_array(cur_fs, &creds, 
-        PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
-        addr_array, &server_count);
+    ret = PVFS_mgmt_get_server_array(cur_fs, &creds, addr_array, &server_count);
     if (ret != 0)
     {
@@ -656 +652 @@
 {
     PVFS_handle handle;
-    int server_idx, tmp_type, flag = 1;
+    int server_idx, flag = 1;
 
     if (!dot_fmt) {
@@ -700 +696 @@
                        PVFS_mgmt_map_addr(cur_fs,
                                           creds,
-                                          addr_array[server_idx],
-                                          &tmp_type),
+                                          addr_array[server_idx]),
                        llu(handle));
             }

branches/orange-next/src/apps/admin/pvfs2-fsck.c

@@ -88 +88 @@
     /* count how many servers we have */
     ret = PVFS_mgmt_count_servers(cur_fs, &creds, 
-        PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
         &server_count);
     if (ret != 0)
@@ -106 +105 @@
     ret = PVFS_mgmt_get_server_array(cur_fs,
                                      &creds, 
-                                     PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
                                      addr_array,
                                      &server_count);

branches/orange-next/src/apps/admin/pvfs2-migrate-collection.c

@@ -689 +689 @@
      * will create
      */
-    char handle_range[] = "4-64000000000";
     TROVE_op_id op_id;
     TROVE_context_id trove_context = -1;
@@ -736 +735 @@
         coll_id, 
         handle,
-        handle_range,
-        NULL,
         1,
         0);

branches/orange-next/src/apps/admin/pvfs2-mkspace.c

@@ -337 +337 @@
         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.root_handle, opts.collection_only, 
                             opts.verbose);
     }

branches/orange-next/src/apps/admin/pvfs2-perf-mon-example.c

@@ -58 +58 @@
     int i,j;
     PVFS_credentials creds;
-    int io_server_count;
+    int server_count;
     int64_t** perf_matrix;
     uint64_t* end_time_ms_array;
     uint32_t* next_id_array;
     PVFS_BMI_addr_t *addr_array;
-    int tmp_type;
     uint64_t next_time;
     float bw;
@@ -84 +83 @@
 
     /* translate local path into pvfs2 relative path */
-    ret = PVFS_util_resolve(user_opts->mnt_point,
-        &cur_fs, pvfs_path, PVFS_NAME_MAX);
+    ret = PVFS_util_resolve(user_opts->mnt_point, &cur_fs, pvfs_path, 
+        PVFS_NAME_MAX);
     if(ret < 0)
     {
@@ -94 +93 @@
     PVFS_util_gen_credentials(&creds);
 
-    /* count how many I/O servers we have */
-    ret = PVFS_mgmt_count_servers(cur_fs, &creds, PVFS_MGMT_IO_SERVER,
-        &io_server_count);
+    /* count how many servers we have */
+    ret = PVFS_mgmt_count_servers(cur_fs, &creds, &server_count);
     if(ret < 0)
     {
@@ -104 +102 @@
 
     /* allocate a 2 dimensional array for statistics */
-    perf_matrix = (int64_t **)malloc(io_server_count*sizeof(int64_t *));
+    perf_matrix = (int64_t **)malloc(server_count*sizeof(int64_t *));
     if(!perf_matrix)
     {
@@ -110 +108 @@
         return(-1);
     }
-    for(i=0; i<io_server_count; i++)
+    for(i=0; i<server_count; i++)
     {
         perf_matrix[i] = (int64_t *)malloc(HISTORY * sizeof(int64_t));
@@ -123 +121 @@
      * we need from each server 
      */
-    next_id_array = (uint32_t *) malloc(io_server_count * sizeof(uint32_t));
+    next_id_array = (uint32_t *) malloc(server_count * sizeof(uint32_t));
     if (next_id_array == NULL)
     {
@@ -129 +127 @@
         return -1;
     }
-    memset(next_id_array, 0, io_server_count*sizeof(uint32_t));
+    memset(next_id_array, 0, server_count*sizeof(uint32_t));
 
     /* allocate an array to keep up with end times from each server */
-    end_time_ms_array = (uint64_t *)malloc(io_server_count * sizeof(uint64_t));
+    end_time_ms_array = (uint64_t *)malloc(server_count * sizeof(uint64_t));
     if (end_time_ms_array == NULL)
     {
@@ -141 +139 @@
     /* build a list of servers to talk to */
     addr_array = (PVFS_BMI_addr_t *)
-        malloc(io_server_count * sizeof(PVFS_BMI_addr_t));
+        malloc(server_count * sizeof(PVFS_BMI_addr_t));
     if (addr_array == NULL)
     {
@@ -149 +147 @@
     ret = PVFS_mgmt_get_server_array(cur_fs,
                                      &creds,
-                                     PVFS_MGMT_IO_SERVER,
                                      addr_array,
-                                     &io_server_count);
+                                     &server_count);
     if (ret < 0)
     {
@@ -168 +165 @@
                                       addr_array,
                                       next_id_array,
-                                      io_server_count, 
+                                      server_count, 
                                       &key_cnt,
                                       HISTORY,
@@ -180 +177 @@
         printf("\nPVFS2 I/O server bandwith statistics (MB/sec):\n");
         printf("==================================================\n");
-        for (i=0; i < io_server_count; i++)
+        for (i=0; i < server_count; i++)
         {
             printf("\nread:  %-30s ",
-                   PVFS_mgmt_map_addr(cur_fs, &creds,addr_array[i], &tmp_type));
+                   PVFS_mgmt_map_addr(cur_fs, &creds,addr_array[i]));
             for (j=0; j < HISTORY; j++)
             {
@@ -211 +208 @@
 
             printf("\nwrite: %-30s ",
-                   PVFS_mgmt_map_addr(cur_fs, &creds,addr_array[i], &tmp_type));
+                   PVFS_mgmt_map_addr(cur_fs, &creds,addr_array[i]));
 
             for (j=0; j < HISTORY; j++)
@@ -242 +239 @@
             printf("==================================================");
             printf("\nread:  %-30s ",
-                   PVFS_mgmt_map_addr(cur_fs, &creds,addr_array[i], &tmp_type));
+                   PVFS_mgmt_map_addr(cur_fs, &creds,addr_array[i]));
 
             for(j = 0; j < HISTORY; j++)
@@ -254 +251 @@
 
             printf("\nwrite:  %-30s ",
-                   PVFS_mgmt_map_addr(cur_fs, &creds,addr_array[i], &tmp_type));
+                   PVFS_mgmt_map_addr(cur_fs, &creds,addr_array[i]));
 
             for(j = 0; j < HISTORY; j++)

branches/orange-next/src/apps/admin/pvfs2-ping.c

@@ -156 +156 @@
 
     ret = PVFS_mgmt_count_servers(
-        cur_fs, &creds, PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER, &count);
+        cur_fs, &creds, &count);
     if (ret < 0)
     {
@@ -270 +270 @@
     PVFS_BMI_addr_t* addr_array;
     int i;
-    int tmp;
  
     PVFS_util_gen_credentials(&creds);
 
-    printf("\n   meta servers:\n");
-    ret = PVFS_mgmt_count_servers(
-        fsid, &creds, PVFS_MGMT_META_SERVER, &count);
+    printf("\n   servers:\n");
+    ret = PVFS_mgmt_count_servers( fsid, &creds, &count);
     if (ret < 0)
     {
@@ -291 +289 @@
 
     ret = PVFS_mgmt_get_server_array(
-        fsid, &creds, PVFS_MGMT_META_SERVER, addr_array, &count);
+        fsid, &creds, addr_array, &count);
     if (ret < 0)
     {
@@ -301 +299 @@
     {
         printf("   %s ",
-               PVFS_mgmt_map_addr(fsid, &creds, addr_array[i], &tmp));
+               PVFS_mgmt_map_addr(fsid, &creds, addr_array[i]));
         ret = PVFS_mgmt_noop(fsid, &creds, addr_array[i], NULL);
         if (ret == 0)
@@ -310 +308 @@
         {
             printf("FAILURE: PVFS_mgmt_noop failed for server: %s\n",
-                   PVFS_mgmt_map_addr(fsid, &creds, addr_array[i], &tmp));
-            return ret;
-        }
-    }
-    free(addr_array);
-
-    printf("\n   data servers:\n");
-    ret = PVFS_mgmt_count_servers(
-        fsid, &creds, PVFS_MGMT_IO_SERVER, &count);
-    if (ret < 0)
-    {
-        PVFS_perror("PVFS_mgmt_count_servers()", ret);
-        return ret;
-    }
-    addr_array = (PVFS_BMI_addr_t *)malloc(
-        count * sizeof(PVFS_BMI_addr_t));
-    if (addr_array == NULL)
-    {
-        perror("malloc");
-        return -PVFS_ENOMEM;
-    }
-
-    ret = PVFS_mgmt_get_server_array(
-        fsid, &creds, PVFS_MGMT_IO_SERVER, addr_array, &count);
-    if (ret < 0)
-    {
-        PVFS_perror("PVFS_mgmt_get_server_array()", ret);
-        return ret;
-    }
-
-    for (i = 0; i < count; i++)
-    {
-        printf("   %s ",
-               PVFS_mgmt_map_addr(fsid, &creds, addr_array[i], &tmp));
-        ret = PVFS_mgmt_noop(fsid, &creds, addr_array[i], NULL);
-        if (ret == 0)
-        {
-            printf("Ok\n");
-        }
-        else
-        {
-            printf("Failure!\n");
+                   PVFS_mgmt_map_addr(fsid, &creds, addr_array[i]));
             return ret;
         }
@@ -371 +328 @@
     int i;
     int ret = -1;
-    int tmp;
     int count;
     PVFS_BMI_addr_t *addr_array;
@@ -377 +333 @@
     PVFS_util_gen_credentials(&creds);
 
-    printf("\n   meta servers:\n");
-    ret = PVFS_mgmt_count_servers(
-        fsid, &creds, PVFS_MGMT_META_SERVER, &count);
+    printf("\n   servers:\n");
+    ret = PVFS_mgmt_count_servers( fsid, &creds, &count);
     if (ret < 0)
     {
@@ -393 +348 @@
     }
 
-    ret = PVFS_mgmt_get_server_array(
-        fsid, &creds, PVFS_MGMT_META_SERVER, addr_array, &count);
+    ret = PVFS_mgmt_get_server_array( fsid, &creds, addr_array, &count);
     if (ret < 0)
     {
@@ -403 +357 @@
     for (i=0; i<count; i++)
     {
-        printf("   %s\n",
-               PVFS_mgmt_map_addr(fsid, &creds, addr_array[i], &tmp));
-    }
-    free(addr_array);
-
-    printf("\n   data servers:\n");
-    ret = PVFS_mgmt_count_servers(
-        fsid, &creds, PVFS_MGMT_IO_SERVER, &count);
-    if (ret < 0)
-    {
-        PVFS_perror("PVFS_mgmt_count_servers()", ret);
-        return ret;
-    }
-    addr_array = (PVFS_BMI_addr_t *)malloc(
-        count * sizeof(PVFS_BMI_addr_t));
-    if (addr_array == NULL)
-    {
-        perror("malloc");
-        return -PVFS_ENOMEM;
-    }
-
-    ret = PVFS_mgmt_get_server_array(
-        fsid, &creds, PVFS_MGMT_IO_SERVER, addr_array, &count);
-    if (ret < 0)
-    {
-        PVFS_perror("PVFS_mgmt_get_server_array()", ret);
-        return ret;
-    }
-
-    for(i=0; i<count; i++)
-    {
-        printf("   %s\n",
-               PVFS_mgmt_map_addr(fsid, &creds, addr_array[i], &tmp));
+        printf("   %s\n", PVFS_mgmt_map_addr(fsid, &creds, addr_array[i]));
     }
     free(addr_array);

branches/orange-next/src/apps/karma/comm.c

@@ -235 +235 @@
     ret = PVFS_mgmt_count_servers(cur_fsid,
                                   &creds,
-                                  PVFS_MGMT_IO_SERVER | PVFS_MGMT_META_SERVER,
                                   &outcount);
     if (ret < 0)
@@ -275 +274 @@
     ret = PVFS_mgmt_get_server_array(cur_fsid,
                                      &creds,
-                                     PVFS_MGMT_IO_SERVER |
-                                     PVFS_MGMT_META_SERVER, internal_addrs,
+                                     internal_addrs,
                                      &outcount);
     if (ret < 0)
@@ -375 +373 @@
         for (i = 0; i < internal_details->count_used; i++)
         {
-            int dummy;
-
             PVFS_strerror_r(internal_details->error[i].error, err_msg, 64);
             snprintf(msgbuf,
@@ -383 +379 @@
                      PVFS_mgmt_map_addr(cur_fsid,
                                         &creds,
-                                        internal_details->error[i].addr,
-                                        &dummy),
+                                        internal_details->error[i].addr),
                      err_msg);
             gui_message_new(msgbuf);
@@ -468 +463 @@
         for (i = 0; i < internal_details->count_used; i++)
         {
-            int dummy;
-
             PVFS_strerror_r(internal_details->error[i].error, err_msg, 64);
             snprintf(msgbuf,
@@ -476 +469 @@
                      PVFS_mgmt_map_addr(cur_fsid,
                                         &creds,
-                                        internal_details->error[i].addr,
-                                        &dummy),
+                                        internal_details->error[i].addr),
                     err_msg);
             gui_message_new(msgbuf);

branches/orange-next/src/client/sysint/fs-add.sm

@@ -286 +286 @@
     assert(js_p->error_code == 0);
     fsid = sm_p->u.get_config.mntent->fs_id;
-    ret = PVFS_mgmt_count_servers(
-        fsid, sm_p->cred_p, PVFS_MGMT_IO_SERVER | PVFS_MGMT_META_SERVER, &count);
+    ret = PVFS_mgmt_count_servers( fsid, sm_p->cred_p, &count );
     if (ret < 0)
     {
@@ -309 +308 @@
 
     ret = PVFS_mgmt_get_server_array(fsid, sm_p->cred_p, 
-            PVFS_MGMT_IO_SERVER | PVFS_MGMT_META_SERVER, sm_p->fetch_config.addr_array, &count);
+            sm_p->fetch_config.addr_array, &count);
     if (ret < 0)
     {
@@ -392 +391 @@
 static int compare_hashes(PINT_client_sm *sm_p, job_status_s *js_p)
 {
-    int i, count, ret = 0, fs_conf_failed = 0, fs_conf_size_mismatch = 0, tmp;
+    int i, count, ret = 0, fs_conf_failed = 0, fs_conf_size_mismatch = 0;
     char **sha1_fs_digests = NULL;
     size_t digest_len;
@@ -427 +426 @@
             gossip_err("     FS config file on %s -> (size) %d\n", 
                    PVFS_mgmt_map_addr(fsid, sm_p->cred_p,
-                   sm_p->fetch_config.addr_array[indexes[i]], &tmp),
+                   sm_p->fetch_config.addr_array[indexes[i]]),
                    sm_p->fetch_config.fs_config_buf_size[indexes[i]] - 1);
             ret = -PVFS_EINVAL;
@@ -459 +458 @@
             gossip_err("     FS config file on %s -> (SHA1) %s\n", 
                    PVFS_mgmt_map_addr(fsid, sm_p->cred_p,
-                   sm_p->fetch_config.addr_array[indexes[i]], &tmp), str);
+                   sm_p->fetch_config.addr_array[indexes[i]]), str);
         }
         ret = -PVFS_EINVAL;

branches/orange-next/src/client/sysint/mgmt-get-config.c

@@ -42 +42 @@
     struct server_configuration_s *config = NULL;
     struct PVFS_sys_mntent mntent;
-    int server_type = 0;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_mgmt_get_config entered\n");
@@ -69 +68 @@
 
     mntent.the_pvfs_config_server =
-        (char*)PINT_cached_config_map_addr(*fsid, *addr, &server_type);
+        (char*)PINT_cached_config_map_addr(*fsid, *addr);
 
     PINT_put_server_config_struct(config);

branches/orange-next/src/client/sysint/mgmt-misc.c

@@ -32 +32 @@
     PVFS_fs_id fs_id,
     PVFS_credentials *credentials,
-    PVFS_BMI_addr_t addr,
-    int *server_type)
-{
-    return PINT_cached_config_map_addr(fs_id, addr, server_type);
+    PVFS_BMI_addr_t addr)
+{
+    return PINT_cached_config_map_addr(fs_id, addr);
 }
 
@@ -63 +62 @@
     int real_count = 0;
 
-    ret = PINT_cached_config_count_servers(
-        fs_id,  PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
-        &real_count);
+    ret = PINT_cached_config_count_servers(fs_id, &real_count);
 
     if (ret < 0)
@@ -87 +84 @@
 
     /* generate default list of servers */
-    ret = PINT_cached_config_get_server_array(
-        fs_id, PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
-        addr_array, &real_count);
+    ret = PINT_cached_config_get_server_array(fs_id, addr_array, &real_count);
 
     if (ret < 0)
@@ -122 +117 @@
     PVFS_error ret = -PVFS_EINVAL;
     PVFS_BMI_addr_t *addr_array = NULL;
-    ret = PINT_cached_config_count_servers(
-        fs_id, PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER, &count);
+    ret = PINT_cached_config_count_servers(fs_id, &count);
 
     if (ret < 0)
@@ -138 +132 @@
 
     /* generate default list of servers */
-    ret = PINT_cached_config_get_server_array(
-        fs_id, PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
-        addr_array, &count);
-
+    ret = PINT_cached_config_get_server_array(fs_id, addr_array, &count);
     if (ret < 0)
     {
@@ -188 +179 @@
     PVFS_fs_id fs_id,
     PVFS_credentials *credentials,
-    int server_type,
     PVFS_BMI_addr_t *addr_array,
     int *inout_count_p)
@@ -194 +184 @@
     PVFS_error ret = -PVFS_EINVAL;
 
-    ret = PINT_cached_config_get_server_array(
-        fs_id, server_type, addr_array, inout_count_p);
+    ret = PINT_cached_config_get_server_array(fs_id, addr_array, inout_count_p);
     return ret;
 }
@@ -209 +198 @@
     PVFS_fs_id fs_id,
     PVFS_credentials *credentials,
-    int server_type,
     int *count)
 {
     PVFS_error ret = -PVFS_EINVAL;
 
-    ret = PINT_cached_config_count_servers(fs_id, server_type, count);
+    ret = PINT_cached_config_count_servers(fs_id, count);
     return ret;
 }

branches/orange-next/src/client/sysint/mgmt-statfs-list.sm

@@ -278 +278 @@
         sm_stat->bmi_address = PVFS_mgmt_map_addr(
             sm_p->u.statfs_list.fs_id, sm_p->cred_p,
-            sm_p->msgarray_op.msgarray[i].svr_addr, &sm_stat->server_type);
+            sm_p->msgarray_op.msgarray[i].svr_addr);
         assert(sm_stat->bmi_address);
 

branches/orange-next/src/client/sysint/sys-create.sm

@@ -414 +414 @@
     struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
     int ret = -PVFS_EINVAL;
-    PVFS_handle_extent_array meta_handle_extent_array;
     PINT_sm_msgpair_state *msg_p = NULL;
-    int server_type;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "create state: "
@@ -438 +436 @@
     msg_p = &sm_p->msgarray_op.msgpair;
 
-    ret = PINT_cached_config_get_next_meta(
-        sm_p->object_ref.fs_id, &msg_p->svr_addr, &meta_handle_extent_array);
+    ret = PINT_cached_config_get_next_server(
+        sm_p->object_ref.fs_id, &msg_p->svr_addr);
     if(ret != 0)
     {
@@ -453 +451 @@
             "PVFS_isys_create() selected meta server: %s\n", 
             PINT_cached_config_map_addr(sm_p->object_ref.fs_id,
-                msg_p->svr_addr,
-                &server_type));
+                msg_p->svr_addr));
     }
 
@@ -467 +464 @@
 
     msg_p->fs_id = sm_p->object_ref.fs_id;
-    PVFS_handle_copy(msg_p->handle, 
-        meta_handle_extent_array.extent_array[0].first);
+
+    /* FIX: what handle do we put here, used to come from the 
+     * meta_handle_extent_array */
+/*  PVFS_handle_copy(msg_p->handle, 
+    meta_handle_extent_array.extent_array[0].first);
+ */
     msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
     msg_p->comp_fn = create_comp_fn;

branches/orange-next/src/client/sysint/sys-mkdir.sm

@@ -343 +343 @@
     struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
     int ret = -PVFS_EINVAL;
-    PVFS_handle_extent_array meta_handle_extent_array;
     PINT_sm_msgpair_state *msg_p = NULL;
 
@@ -356 +355 @@
     msg_p = &sm_p->msgarray_op.msgpair;
 
-    ret = PINT_cached_config_get_next_meta(
+    /* FIX: used to get extent array here */
+    ret = PINT_cached_config_get_next_server(
         sm_p->object_ref.fs_id,
-        &msg_p->svr_addr, &meta_handle_extent_array);
+        &msg_p->svr_addr);
 
     if (ret)
@@ -371 +371 @@
         *sm_p->cred_p,
         sm_p->object_ref.fs_id,
-        meta_handle_extent_array,
         sm_p->u.mkdir.sys_attr,
         sm_p->hints);
 
     msg_p->fs_id = sm_p->object_ref.fs_id;
+    /* FIX: used to copy handle from extent_array */
+/*
     PVFS_handle_copy(msg_p->handle, 
                      meta_handle_extent_array.extent_array[0].first);
+ */
     msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
     msg_p->comp_fn = mkdir_msg_comp_fn;

branches/orange-next/src/client/sysint/sys-statfs.sm

@@ -76 +76 @@
 
     /* count the number of servers */
-    ret = PINT_cached_config_count_servers(
-        fs_id,  PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
-        &sm_p->u.statfs_list.count);
+    ret = PINT_cached_config_count_servers( fs_id, &sm_p->u.statfs_list.count);
     if (ret < 0)
     {
@@ -105 +103 @@
     /* generate default list of servers */
     ret = PINT_cached_config_get_server_array(
-        fs_id, PVFS_MGMT_IO_SERVER|PVFS_MGMT_META_SERVER,
-        sm_p->u.statfs_list.addr_array, &sm_p->u.statfs_list.count);
+        fs_id, sm_p->u.statfs_list.addr_array, &sm_p->u.statfs_list.count);
     if (ret < 0)
     {

branches/orange-next/src/client/sysint/sys-symlink.sm

@@ -364 +364 @@
     struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
     int ret = -PVFS_EINVAL;
-    PVFS_handle_extent_array meta_handle_extent_array;
     PINT_sm_msgpair_state *msg_p = NULL;
 
@@ -374 +373 @@
     msg_p = &sm_p->msgarray_op.msgpair;
 
-    ret = PINT_cached_config_get_next_meta(
+    ret = PINT_cached_config_get_next_server(
         sm_p->object_ref.fs_id,
-        &msg_p->svr_addr, &meta_handle_extent_array);
+        &msg_p->svr_addr);
 
     if (ret)
@@ -391 +390 @@
         PVFS_TYPE_SYMLINK,
         1,
-        meta_handle_extent_array,
         sm_p->hints);
 
     msg_p->fs_id = sm_p->object_ref.fs_id;
+    /* FIX: what do we copy to the handle here, used to be extent_array */
+/*
     PVFS_handle_copy(msg_p->handle, 
         meta_handle_extent_array.extent_array[0].first);
+ */
     msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
     msg_p->comp_fn = symlink_create_comp_fn;

branches/orange-next/src/common/misc/fsck-utils.c

@@ -130 +130 @@
     int num_servers = 0;
     int i = 0;
-    int server_type = 0;
     PVFS_BMI_addr_t *addresses = NULL;
     char *fs_config = NULL;
@@ -147 +146 @@
     ret = PVFS_mgmt_count_servers(*cur_fs,
                                 (PVFS_credentials *) creds,
-                                PVFS_MGMT_IO_SERVER | PVFS_MGMT_META_SERVER,
                                 &num_servers);
     if(ret < 0)
@@ -166 +164 @@
         *cur_fs,
         (PVFS_credentials *) creds,
-        PVFS_MGMT_IO_SERVER | PVFS_MGMT_META_SERVER,
         addresses, &num_servers);
     if(ret < 0)
@@ -177 +174 @@
     for (i = 0; i < num_servers; i++)
     {
-        server_type = 0;
         server_name = NULL;
 
         /* get the pretty server name */
-        server_name = PINT_cached_config_map_addr(
-                        *cur_fs, addresses[i], &server_type);
+        server_name = PINT_cached_config_map_addr( *cur_fs, addresses[i]);
         assert(server_name);
 
@@ -1081 +1076 @@
     err = PVFS_mgmt_count_servers(*cur_fs,
                                 (PVFS_credentials *) creds,
-                                PVFS_MGMT_IO_SERVER | PVFS_MGMT_META_SERVER,
                                 &server_count);
     if(err < 0)
@@ -1102 +1096 @@
     err = PVFS_mgmt_get_server_array(*cur_fs,
                                (PVFS_credentials *) creds,
-                               PVFS_MGMT_IO_SERVER | PVFS_MGMT_META_SERVER,
                                PINT_handle_wrangler_handlelist.addr_array,
                                &server_count);
@@ -1544 +1537 @@
     int i = 0;
     int j = 0;
-    int server_type = 0;
     PVFS_sysresp_getattr attributes;
     PVFS_object_ref pref;
@@ -1554 +1546 @@
     {
         /* get the pretty server name */
-        server_name = PINT_cached_config_map_addr(
-            *cur_fs, PINT_handle_wrangler_handlelist.
-            addr_array[i], &server_type);
+        server_name = PINT_cached_config_map_addr(*cur_fs, 
+            PINT_handle_wrangler_handlelist.addr_array[i]);
 
         for (j = 0; j < PINT_handle_wrangler_handlelist.size_array[i]; j++)

branches/orange-next/src/common/misc/pint-cached-config.c

@@ -474 +474 @@
     return NULL;
 }
-
-
-/* PINT_cached_config_check_type()
- *
- * Retrieves the server type flags for a specified BMI addr string
- *
- * returns 0 on success, -errno on failure
- */
-int PINT_cached_config_check_type(
-    PVFS_fs_id fsid,
-    const char *server_addr_str,
-    int* server_type)
-{
-    int ret = -PVFS_EINVAL, i = 0;
-    struct qlist_head *hash_link = NULL;
-    struct config_fs_cache_s *cur_config_cache = NULL;
-
-    hash_link = qhash_search(PINT_fsid_config_cache_table,&(fsid));
-    if (!hash_link)
-    {
-        return(-PVFS_EINVAL);
-    }
-    cur_config_cache = qlist_entry(
-        hash_link, struct config_fs_cache_s, hash_link);
-    assert(cur_config_cache);
-    assert(cur_config_cache->fs);
-
-    ret = cache_server_array(fsid);
-    if (ret < 0)
-    {
-        return(ret);
-    }
-
-    /* run through general server list for a match */
-    for(i = 0; i < cur_config_cache->server_count; i++)
-    {
-        if (!(strcmp(cur_config_cache->server_array[i].addr_string,
-           server_addr_str)))
-        {
-            *server_type = cur_config_cache->server_array[i].server_type;
-            return(0);
-        }
-    }
-    return(-PVFS_EINVAL);
-}
-
 
 /* PINT_cached_config_count_servers()

branches/orange-next/src/common/misc/server-config.c

@@ -75 +75 @@
 static DOTCONF_CB(get_trusted_network);
 #endif
-static DOTCONF_CB(get_range_list);
 static DOTCONF_CB(get_bmi_module_list);
 static DOTCONF_CB(get_flow_module_list);
@@ -375 +374 @@
         CTX_DISTRIBUTION,NULL},
 
-    /* As logical files are created in pvfs, the data files and meta files
-     * that represent them are given filesystem unique handle values.  The
-     * user can specify a range of values (or set of ranges) 
-     * to be allocated to data files and meta files for a particular server,
-     * using the Range option in the DataHandleRanges and MetaHandleRanges
-     * contexts.  Note that in most cases, its easier to let the 
-     * pvfs2-genconfig script determine the best ranges to specify.
-     *
-     * This option specifies a range of handle values that can be used for 
-     * a particular pvfs server in a particular context (meta handles
-     * or data handles).  The DataHandleRanges and MetaHandleRanges contexts
-     * should contain one or more Range options.  The format is:
-     *
-     * Range {alias} {min value1}-{max value1}[, {min value2}-{max value2},...]
-     *
-     * Where {alias} is one of the alias strings already specified in the
-     * Aliases context.
-     *
-     * {min value} and {max value} are positive integer values that specify
-     * the range of possible handles that can be given out for that particular
-     * host.  {max value} must be less than 18446744073709551615 (UINT64_MAX).
-     *
-     * As shown in the specified format, multiple ranges can be specified for
-     * the same alias.  The format requires that max value of a given range
-     * is less than the min value of the next one, 
-     * i.e. {max value1}<{min value2}
-     * 
-     * Example of a Range option for data handles:
-     *
-     * Range mynode1 2147483651-4294967297
-     */
-    {"Range",ARG_LIST, get_range_list,NULL,
-        CTX_METAHANDLERANGES|CTX_DATAHANDLERANGES,NULL},
-
     /* Specifies the handle value for the root of the Filesystem.  This
      * is a required option in the Filesystem context.  The format is:
@@ -2480 +2445 @@
 }
 
-DOTCONF_CB(get_range_list)
-{
-    int i = 0;
-    struct filesystem_configuration_s *fs_conf = NULL;
-    struct server_configuration_s *config_s = 
-        (struct server_configuration_s *)cmd->context;
-
-    fs_conf = (struct filesystem_configuration_s *)
-    PINT_llist_head(config_s->file_systems);
-    assert(fs_conf);
-
-    for(i = 0; i < cmd->arg_count; i += 2)
-    {
-        if (is_valid_alias(config_s->host_aliases, cmd->data.list[i]))
-        {
-            i++;
-            assert(cmd->data.list[i]);
-
-        }
-        else
-        {
-            return("Unrecognized alias.\n");
-        }
-    }
-    return NULL;
-}
-
 DOTCONF_CB(get_param)
 {

branches/orange-next/src/common/misc/server-config.h

@@ -23 +23 @@
     CTX_ALIASES          = (1 << 3),
     CTX_FILESYSTEM       = (1 << 4),
-    CTX_METAHANDLERANGES = (1 << 5),
-    CTX_DATAHANDLERANGES = (1 << 6),
-    CTX_STORAGEHINTS     = (1 << 7),
-    CTX_DISTRIBUTION     = (1 << 8),
-    CTX_SECURITY         = (1 << 9),
-    CTX_EXPORT           = (1 << 10),
-    CTX_SERVER_OPTIONS   = (1 << 11),
+    CTX_STORAGEHINTS     = (1 << 5),
+    CTX_DISTRIBUTION     = (1 << 6),
+    CTX_SECURITY         = (1 << 7),
+    CTX_EXPORT           = (1 << 8),
+    CTX_SERVER_OPTIONS   = (1 << 9),
 };
 
@@ -36 +34 @@
     PVFS_BMI_addr_t addr;
     char *addr_string;
-    int server_type;
 } phys_server_desc_s;
 
@@ -125 +122 @@
     char *host_id;
     int host_index;
-    char *server_alias;             /* the command line server-alias parameter */
+    char *server_alias;             /* the cli server-alias parameter */
     int my_server_options;
     char *data_path;                /* path to data storage directory */
@@ -137 +134 @@
     int  client_job_bmi_timeout; 
     int  client_job_flow_timeout;
-    int  client_retry_limit;        /* how many times to retry client operations */
+    int  client_retry_limit;        /* retry client operations count */
     int  client_retry_delay_ms;     /* delay between retries */
     int  perf_update_interval;      /* how quickly (in msecs) to

branches/orange-next/src/server/create.sm

@@ -154 +154 @@
     int ret = -1;
     job_id_t i;
-    server_configuration_s *config = get_server_config_struct();
+    //server_configuration_s *config = get_server_config_struct();
 
     /* first state to check in, make sure the attr mask contains the dist bit. 
@@ -167 +167 @@
         return SM_ACTION_COMPLETE;
     }
-
-    ret = PINT_cached_config_get_server(
-        s_op->req->u.create.fs_id,
-        config->host_id);
 
     ret = job_trove_dspace_create(
@@ -354 +350 @@
     }
 
-    /* find local extent array */
-    ret = PINT_cached_config_get_server(
-        s_op->req->u.create.fs_id,
-        config->host_id);
-    if(ret < 0)
-    {
-        js_p->error_code = ret;
-        return(SM_ACTION_COMPLETE);
-    }
-
     /* deliberately not setting SYNC flag, because both the attrs and
      * keyvals will be synced in later states

branches/orange-next/src/server/unstuff.sm

@@ -225 +225 @@
         struct PINT_smcb *smcb, job_status_s *js_p)
 {
-    int ret;
-    job_id_t j_id;
+    int ret = 0;
+    //job_id_t j_id;
     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);