This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch inactivity_integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/inactivity_integration by this
push:
new 7cda4ff [DLAB-465] Fix problem with Inactivity file which doesn't
have ID for Data Engine Cluster in Azure and GCP
new 9d9562c Merge pull request #20 from ioleksandr/inactivity_integration
7cda4ff is described below
commit 7cda4ff74bb11395e2e786900d69046ce96e299a
Author: Oleksandr_Isniuk <[email protected]>
AuthorDate: Thu Feb 28 18:01:02 2019 +0200
[DLAB-465] Fix problem with Inactivity file which doesn't have ID for Data
Engine Cluster in Azure and GCP
---
.../src/general/scripts/aws/common_notebook_configure_dataengine.py | 3 ++-
.../general/scripts/azure/common_notebook_configure_dataengine.py | 5 +++--
.../src/general/scripts/azure/dataengine_start.py | 5 +----
.../src/general/scripts/gcp/common_notebook_configure_dataengine.py | 6 ++++--
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
index 01f81e0..e26bfec 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
@@ -83,7 +83,8 @@ if __name__ == "__main__":
try:
logging.info('[INSTALLING KERNELS INTO SPECIFIED NOTEBOOK]')
print('[INSTALLING KERNELS INTO SPECIFIED NOTEBOOK]')
- params = "--cluster_name {} --spark_version {} --hadoop_version {}
--os_user {} --spark_master {} --keyfile {} --notebook_ip {} --spark_master_ip
{}".\
+ params = "--cluster_name {0} --spark_version {1} --hadoop_version {2}
--os_user {3} --spark_master {4}" \
+ " --keyfile {5} --notebook_ip {6} --spark_master_ip {7}".\
format(notebook_config['cluster_name'],
os.environ['notebook_spark_version'],
os.environ['notebook_hadoop_version'],
notebook_config['dlab_ssh_user'],
notebook_config['spark_master_url'],
notebook_config['key_path'],
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
b/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
index 9e84548..d3958ef 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/common_notebook_configure_dataengine.py
@@ -82,11 +82,12 @@ if __name__ == "__main__":
try:
logging.info('[INSTALLING KERNELS INTO SPECIFIED NOTEBOOK]')
print('[INSTALLING KERNELS INTO SPECIFIED NOTEBOOK]')
- params = "--cluster_name {} --spark_version {} --hadoop_version {}
--os_user {} --spark_master {} --keyfile {} --notebook_ip {} --datalake_enabled
{}".\
+ params = "--cluster_name {0} --spark_version {1} --hadoop_version {2}
--os_user {3} --spark_master {4}" \
+ " --keyfile {5} --notebook_ip {6} --datalake_enabled {7}
--spark_master_ip {8}".\
format(notebook_config['cluster_name'],
os.environ['notebook_spark_version'],
os.environ['notebook_hadoop_version'],
notebook_config['dlab_ssh_user'],
notebook_config['spark_master_url'],
notebook_config['key_path'], notebook_config['notebook_ip'],
- os.environ['azure_datalake_enable'])
+ os.environ['azure_datalake_enable'],
notebook_config['spark_master_ip'])
try:
local("~/scripts/{}_{}.py {}".format(os.environ['application'],
'install_dataengine_kernels', params))
except:
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
index af42158..0e75385 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
@@ -82,11 +82,8 @@ if __name__ == "__main__":
logging.info('[UPDATE LAST ACTIVITY TIME]')
print('[UPDATE LAST ACTIVITY TIME]')
data_engine['computational_id'] = data_engine['cluster_name'] + '-m'
- data_engine['tag_name'] = data_engine['service_base_name'] + '-Tag'
data_engine['notebook_ip'] =
AzureMeta().get_private_ip_address(data_engine['resource_group_name'],
os.environ['notebook_instance_name'])
- data_engine['computational_ip'] =
AzureMeta().get_private_ip_address(data_engine['tag_name'],
-
data_engine['computational_id']).get(
- 'Private')
+ data_engine['computational_ip'] =
AzureMeta().get_private_ip_address(data_engine['resource_group_name'],
data_engine['computational_id'])
data_engine['keyfile'] = '{}{}.pem'.format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
params = '--os_user {0} --notebook_ip {1} --keyfile "{2}" --cluster_ip
{3}' \
.format(os.environ['conf_os_user'], data_engine['notebook_ip'],
data_engine['keyfile'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
index 116aeff..c8c1a6f 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine.py
@@ -81,10 +81,12 @@ if __name__ == "__main__":
try:
logging.info('[INSTALLING KERNELS INTO SPECIFIED NOTEBOOK]')
print('[INSTALLING KERNELS INTO SPECIFIED NOTEBOOK]')
- params = "--cluster_name {} --spark_version {} --hadoop_version {}
--os_user {} --spark_master {} --keyfile {} --notebook_ip {}".\
+ params = "--cluster_name {0} --spark_version {1} --hadoop_version {2}
--os_user {3} --spark_master {4} --keyfile {5}" \
+ "--notebook_ip {6} --spark_master_ip {7}".\
format(notebook_config['cluster_name'],
os.environ['notebook_spark_version'],
os.environ['notebook_hadoop_version'],
notebook_config['dlab_ssh_user'],
- notebook_config['spark_master_url'],
notebook_config['key_path'], notebook_config['notebook_ip'])
+ notebook_config['spark_master_url'],
notebook_config['key_path'],
+ notebook_config['notebook_ip'],
notebook_config['spark_master_ip'])
try:
local("~/scripts/{}_{}.py {}".format(os.environ['application'],
'install_dataengine_kernels', params))
except:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
