ESS/BASE: orte-restart needs sstore
Running orte-restart requires an initialized sstore. This opens the sstore component for FT builds just like the snapc component. This commit was SVN r30796.
Этот коммит содержится в:
родитель
bd275e642e
Коммит
f17ec1ab10
@ -12,6 +12,8 @@
|
|||||||
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
|
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
* Copyright (c) 2013 Intel, Inc. All rights reserved.
|
* Copyright (c) 2013 Intel, Inc. All rights reserved.
|
||||||
|
* Copyright (c) 2014 Hochschule Esslingen. All rights reserved.
|
||||||
|
*
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -43,6 +45,7 @@
|
|||||||
#include "orte/mca/state/base/base.h"
|
#include "orte/mca/state/base/base.h"
|
||||||
#if OPAL_ENABLE_FT_CR == 1
|
#if OPAL_ENABLE_FT_CR == 1
|
||||||
#include "orte/mca/snapc/base/base.h"
|
#include "orte/mca/snapc/base/base.h"
|
||||||
|
#include "orte/mca/sstore/base/base.h"
|
||||||
#endif
|
#endif
|
||||||
#include "orte/util/proc_info.h"
|
#include "orte/util/proc_info.h"
|
||||||
#include "orte/util/session_dir.h"
|
#include "orte/util/session_dir.h"
|
||||||
@ -175,11 +178,22 @@ int orte_ess_base_tool_setup(void)
|
|||||||
error = "orte_snapc_base_open";
|
error = "orte_snapc_base_open";
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
if (ORTE_SUCCESS != (ret = mca_base_framework_open(&orte_sstore_base_framework, 0))) {
|
||||||
|
ORTE_ERROR_LOG(ret);
|
||||||
|
error = "orte_sstore_base_open";
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
if (ORTE_SUCCESS != (ret = orte_snapc_base_select(ORTE_PROC_IS_HNP, ORTE_PROC_IS_APP))) {
|
if (ORTE_SUCCESS != (ret = orte_snapc_base_select(ORTE_PROC_IS_HNP, ORTE_PROC_IS_APP))) {
|
||||||
ORTE_ERROR_LOG(ret);
|
ORTE_ERROR_LOG(ret);
|
||||||
error = "orte_snapc_base_select";
|
error = "orte_snapc_base_select";
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
if (ORTE_SUCCESS != (ret = orte_sstore_base_select())) {
|
||||||
|
ORTE_ERROR_LOG(ret);
|
||||||
|
error = "orte_sstore_base_select";
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
/* Tools do not need all the OPAL CR stuff */
|
/* Tools do not need all the OPAL CR stuff */
|
||||||
opal_cr_set_enabled(false);
|
opal_cr_set_enabled(false);
|
||||||
@ -201,6 +215,7 @@ int orte_ess_base_tool_finalize(void)
|
|||||||
|
|
||||||
#if OPAL_ENABLE_FT_CR == 1
|
#if OPAL_ENABLE_FT_CR == 1
|
||||||
mca_base_framework_close(&orte_snapc_base_framework);
|
mca_base_framework_close(&orte_snapc_base_framework);
|
||||||
|
mca_base_framework_close(&orte_sstore_base_framework);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* if I am a tool, then all I will have done is
|
/* if I am a tool, then all I will have done is
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user