From cf5cdad40f86af2b552f1db29a3d394fd4e5b784 Mon Sep 17 00:00:00 2001 From: Edgar Gabriel Date: Fri, 22 Jun 2018 14:12:02 -0500 Subject: [PATCH] fcoll: make vulcan the default component make vulcan the default component except for Lustre file systems. Signed-off-by: Edgar Gabriel --- ompi/mca/fcoll/base/fcoll_base_file_select.c | 5 +++++ ompi/mca/fcoll/two_phase/fcoll_two_phase_module.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ompi/mca/fcoll/base/fcoll_base_file_select.c b/ompi/mca/fcoll/base/fcoll_base_file_select.c index 874c765dc4..e21c2fe84b 100644 --- a/ompi/mca/fcoll/base/fcoll_base_file_select.c +++ b/ompi/mca/fcoll/base/fcoll_base_file_select.c @@ -268,6 +268,11 @@ int mca_fcoll_base_query_table (struct ompio_file_t *file, char *name) return 1; } } + if (!strcmp (name, "vulcan")) { + if ( (LUSTRE != file->f_fstype)) { + return 1; + } + } if (!strcmp (name, "dynamic")) { if ((int)file->f_cc_size < file->f_bytes_per_agg && file->f_cc_size >= file->f_stripe_size) { diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_module.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_module.c index 53fbb363b7..b5d0b41544 100644 --- a/ompi/mca/fcoll/two_phase/fcoll_two_phase_module.c +++ b/ompi/mca/fcoll/two_phase/fcoll_two_phase_module.c @@ -63,8 +63,8 @@ mca_fcoll_two_phase_component_file_query (ompio_file_t *fh, int *priority) } if (mca_fcoll_base_query_table (fh, "two_phase")) { - if (*priority < 50) { - *priority = 50; + if (*priority < 35) { + *priority = 35; } }