Changeset 9283

Timestamp:

04/19/12 10:01:24 (13 months ago)

Author:

elaine

Message:

Allow threshold for tree logic to be specified in the config file.

Location:

branches/stable/src

Files:

• common/misc/server-config.c (modified) (3 diffs)
• common/misc/server-config.h (modified) (1 diff)
• server/tree-communicate.sm (modified) (2 diffs)

branches/stable/src/common/misc/server-config.c

@@ -126 +126 @@
 static DOTCONF_CB(directio_ops_per_queue);
 static DOTCONF_CB(directio_timeout);
+static DOTCONF_CB(tree_width);
+static DOTCONF_CB(tree_threshhold);
 
 static FUNC_ERRORHANDLER(errorhandler);
@@ -1019 +1021 @@
         CTX_STORAGEHINTS, "1000"},
 
+    /* Specifies the number of partitions to use for tree communication. */
+    {"TreeWidth", ARG_INT, tree_width, NULL,
+        CTX_FILESYSTEM, "2"},
+
+    /* Specifies the minimum number of servers to contact before tree communication kicks in. */
+    {"TreeThreshhold", ARG_INT, tree_threshhold, NULL,
+        CTX_FILESYSTEM, "2"},
+
     LAST_OPTION
 };
@@ -3028 +3038 @@
 }
 
+DOTCONF_CB(tree_width)
+{
+    struct server_configuration_s *config_s =
+        (struct server_configuration_s *)cmd->context;
+
+    config_s->tree_width = cmd->data.value;
+
+    return NULL;
+}
+
+DOTCONF_CB(tree_threshhold)
+{
+    struct server_configuration_s *config_s =
+        (struct server_configuration_s *)cmd->context;
+
+    config_s->tree_threshhold = cmd->data.value;
+
+    return NULL;
+}
+
 /*
  * Function: PINT_config_release

branches/stable/src/common/misc/server-config.h

@@ -203 +203 @@
     int trove_method;
     void *private_data;
+    int32_t tree_width;
+    int32_t tree_threshhold;
 } server_configuration_s;
 

branches/stable/src/server/tree-communicate.sm

@@ -33 +33 @@
 #include "extent-utils.h"
 
-#define MAX_PARTITIONS  2
+//#define       MAX_PARTITIONS  2
 
 enum
@@ -247 +247 @@
     if (s_op->u.tree_communicate.handle_array_remote_count > 0) {
 
-      /* Decide how to divide the remote handles. If there are only a few (MAX_PARTITIONS or
-         fewer) then go ahead and send to each remaining server individually. */
-      if (s_op->u.tree_communicate.handle_array_remote_count > MAX_PARTITIONS)
+      /* Decide how to divide the remote handles. If there are only a few (fewer than
+         tree_threshhold from the config file) then go ahead and send to each remaining server individually. */
+      if (s_op->u.tree_communicate.handle_array_remote_count > server_config->tree_threshhold)
       {
-          num_partitions = MAX_PARTITIONS;
+          num_partitions = server_config->tree_width;
           num_files_per_server = s_op->u.tree_communicate.handle_array_remote_count /
-                   MAX_PARTITIONS;
+                   server_config->tree_width;
           if (num_partitions * num_files_per_server <
                    s_op->u.tree_communicate.handle_array_remote_count) {