You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/08/20 13:24:12 UTC
[incubator-datalab] 02/02: [DATALAB-1864]: changed where partition
mount point check is called
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-1864
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit c128f8917a3776600cfad5cc3d1cd62b2689d7cc
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Aug 20 16:24:02 2021 +0300
[DATALAB-1864]: changed where partition mount point check is called
---
.../general/scripts/azure/dataengine_configure.py | 25 ----------------------
.../general/scripts/os/common_clean_instance.py | 2 ++
2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
index 61d3cf5..088fbec 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
@@ -74,19 +74,6 @@ def configure_slave(slave_number, data_engine):
sys.exit(1)
try:
- logging.info('[ENSURING RIGHT MOUNT PATHS FOR SLAVE NODE]')
- print('[ENSURING RIGHT MOUNT PATHS FOR SLAVE NODE]')
- try:
- AzureActions.ensure_right_mount_paths()
- except:
- traceback.print_exc()
- raise Exception
- except Exception as err:
- clear_resources()
- datalab.fab.append_result("Failed to ensure_right_mount_paths on slave instance..", str(err))
- sys.exit(1)
-
- try:
logging.info('[CLEANING INSTANCE FOR SLAVE NODE]')
print('[CLEANING INSTANCE FOR SLAVE NODE]')
params = '--hostname {} --keyfile {} --os_user {} --application {}' \
@@ -277,18 +264,6 @@ if __name__ == "__main__":
datalab.fab.append_result("Failed to install ssh user key on master.", str(err))
sys.exit(1)
- try:
- logging.info('[ENSURING RIGHT MOUNT PATHS FOR MASTER NODE]')
- print('[ENSURING RIGHT MOUNT PATHS FOR MASTER NODE]')
- try:
- AzureActions.ensure_right_mount_paths()
- except:
- traceback.print_exc()
- raise Exception
- except Exception as err:
- clear_resources()
- datalab.fab.append_result("Failed to ensure right mount paths on master instance..", str(err))
- sys.exit(1)
try:
logging.info('[CLEANING INSTANCE FOR MASTER NODE]')
diff --git a/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py b/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py
index 6b24356..b1fa4eb 100644
--- a/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py
+++ b/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py
@@ -25,6 +25,7 @@ import argparse
import os
import sys
from datalab.notebook_lib import *
+from datalab.actions_lib import ensure_right_mount_paths
from fabric import *
parser = argparse.ArgumentParser()
@@ -121,6 +122,7 @@ if __name__ == "__main__":
conn = datalab.fab.init_datalab_connection(args.hostname, args.os_user, args.keyfile)
if os.environ['conf_cloud_provider'] == 'azure':
+ ensure_right_mount_paths()
de_master_name = '{}-{}-{}-de-{}-m'.format(
os.environ['conf_service_base_name'],
os.environ['project_name'],
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org