This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-483
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-483 by this push:
new a4c3bdb fixed issue with jar list
a4c3bdb is described below
commit a4c3bdb0bcede2addfa2ec8e6c0d0066bfb4e6cf
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Wed Mar 20 13:06:42 2019 +0200
fixed issue with jar list
---
infrastructure-provisioning/src/general/lib/aws/actions_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/azure/actions_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index 85d589a..51d4567 100644
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@ -1733,7 +1733,7 @@ def configure_zeppelin_emr_interpreter(emr_version,
cluster_name, region, spark_
def configure_dataengine_spark(cluster_name, jars_dir, cluster_dir,
datalake_enabled, spark_configs=''):
- local("jar_list=`find {0} -name '*.jar' | tr '\\n' ','` ; echo
\"spark.jars $jar_list\" >> \
+ local("jar_list=`find {0} -name '*.jar' | tr '\\n' ',' | sed 's/,$//'` ;
echo \"spark.jars $jar_list\" >> \
/tmp/{1}/notebook_spark-defaults_local.conf".format(jars_dir,
cluster_name))
region = local('curl
http://169.254.169.254/latest/meta-data/placement/availability-zone',
capture=True)[:-1]
if region == 'us-east-1':
diff --git a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
index 11302e3..4fbe192 100644
--- a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
@@ -1150,7 +1150,7 @@ def configure_local_spark(jars_dir, templates_dir,
memory_type='driver'):
def configure_dataengine_spark(cluster_name, jars_dir, cluster_dir,
datalake_enabled, spark_configs=''):
- local("jar_list=`find {0} -name '*.jar' | tr '\\n' ','` ; echo
\"spark.jars $jar_list\" >> \
+ local("jar_list=`find {0} -name '*.jar' | tr '\\n' ',' | sed 's/,$//'` ;
echo \"spark.jars $jar_list\" >> \
/tmp/{1}/notebook_spark-defaults_local.conf".format(jars_dir,
cluster_name))
if os.path.exists('{0}spark/conf/spark-defaults.conf'.format(cluster_dir)):
additional_spark_properties = local('diff --changed-group-format="%>"
--unchanged-group-format="" '
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 52c33f0..c762fda 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -1338,7 +1338,7 @@ def install_dataengine_spark(cluster_name, spark_link,
spark_version, hadoop_ver
def configure_dataengine_spark(cluster_name, jars_dir, cluster_dir,
datalake_enabled, spark_configs=''):
- local("jar_list=`find {0} -name '*.jar' | tr '\\n' ','` ; echo
\"spark.jars $jar_list\" >> \
+ local("jar_list=`find {0} -name '*.jar' | tr '\\n' ',' | sed 's/,$//'` ;
echo \"spark.jars $jar_list\" >> \
/tmp/{1}/notebook_spark-defaults_local.conf".format(jars_dir,
cluster_name))
if os.path.exists('{0}spark/conf/spark-defaults.conf'.format(cluster_dir)):
additional_spark_properties = local('diff --changed-group-format="%>"
--unchanged-group-format="" '
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
