fix default shuffle options

pdlfs · Jul 30, 2017 · 5c857e0 · 5c857e0
1 parent 5447491
commit 5c857e0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/common.sh.in b/scripts/common.sh.in
@@ -773,13 +773,13 @@ do_run() {
             "PRELOAD_No_paranoid_pre_barrier" ${XX_NO_PRE_BR:-"1"}
             "PRELOAD_No_epoch_pre_flushing" ${XX_NO_PRE_FLUSH:-"0"}
             "PRELOAD_Enable_verbose_error" ${XX_VERBOSE:-"1"}
+            "SHUFFLE_Mercury_proto" ${XX_HG_PROTO:-"bmi+tcp"}
             "SHUFFLE_Mercury_progress_timeout" ${XX_HG_TIMEOUT:-"100"}
             "SHUFFLE_Mercury_progress_warn_interval" ${XX_HG_INTERVAL:-"200"}
-            "SHUFFLE_Virtual_factor" ${XX_RING_VF:-"1024"}
-            "SHUFFLE_Mercury_proto" ${XX_MERCURY_PROTO:-"bmi+tcp"}
             "SHUFFLE_Buffer_per_queue" ${XX_RPC_BUF:-"32768"}
             "SHUFFLE_Num_outstanding_rpc" ${XX_RPC_DEPTH:-"16"}
             "SHUFFLE_Use_worker_thread" ${XX_RPC_USE_WORKER:-"1"}
+            "SHUFFLE_Virtual_factor" ${XX_RING_VF:-"1024"}
             "SHUFFLE_Subnet" "${ip_subnet}"
             "PLFSDIR_Skip_checksums" ${XX_SKIP_CRC:-"1"}
             "PLFSDIR_Memtable_size" ${XX_MEMTABLE_SIZE:-"48MiB"}