[1/2] ambari git commit: AMBARI-19123 Update zeppelin configuration for ambari 2.5 (prabhjyotsingh)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 2d8a77642 -> 34aa7559f
refs/heads/trunk b77b2fac3 -> 61255affe
AMBARI-19123 Update zeppelin configuration for ambari 2.5 (prabhjyotsingh)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34aa7559
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34aa7559
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34aa7559
Branch: refs/heads/branch-2.5
Commit: 34aa7559fc25e357709bca0c9869e950a1de
Parents: 2d8a776
Author: Renjith Kamath
Authored: Thu Dec 15 12:07:18 2016 +0530
Committer: Renjith Kamath
Committed: Thu Dec 15 12:07:18 2016 +0530
--
.../0.6.0.2.5/configuration/zeppelin-env.xml| 163 ++-
1 file changed, 88 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/34aa7559/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index 317ad73..2beac97 100644
---
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -60,94 +60,80 @@
zeppelin_env_content
This is the jinja template for zeppelin-env.sh
file
-# Spark master url. eg. spark://master_addr:7077. Leave empty if you want to
use local mode
+# export JAVA_HOME=
+export JAVA_HOME={{java64_home}}
+# export MASTER= # Spark master url. eg.
spark://master_addr:7077. Leave empty if you want to use local mode.
export MASTER=yarn-client
export SPARK_YARN_JAR={{spark_jar}}
+# export ZEPPELIN_JAVA_OPTS # Additional jvm options. for
example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g
-Dspark.cores.max=16"
+export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory={{executor_mem}}
-Dspark.executor.instances={{executor_instances}}
-Dspark.yarn.queue={{spark_queue}}"
+# export ZEPPELIN_MEM # Zeppelin jvm mem options
Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
+# export ZEPPELIN_INTP_MEM# zeppelin interpreter process
jvm mem options. Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
+# export ZEPPELIN_INTP_JAVA_OPTS # zeppelin interpreter process
jvm options.
+# export ZEPPELIN_SSL_PORT# ssl port (used when ssl
environment variable is set to true)
-
-# Where log files are stored. PWD by default.
+# export ZEPPELIN_LOG_DIR # Where log files are stored.
PWD by default.
export ZEPPELIN_LOG_DIR={{zeppelin_log_dir}}
-
-# The pid files are stored. /tmp by default.
+# export ZEPPELIN_PID_DIR # The pid files are stored.
${ZEPPELIN_HOME}/run by default.
export ZEPPELIN_PID_DIR={{zeppelin_pid_dir}}
-
-
-export JAVA_HOME={{java64_home}}
-
-# Additional jvm options. for example, export
ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16"
-export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory={{executor_mem}}
-Dspark.executor.instances={{executor_instances}}
-Dspark.yarn.queue={{spark_queue}}"
-
-
-# Zeppelin jvm mem options Default -Xmx1024m -XX:MaxPermSize=512m
-# export ZEPPELIN_MEM
-
-# zeppelin interpreter process jvm mem options. Defualt = ZEPPELIN_MEM
-# export ZEPPELIN_INTP_MEM
-
-# zeppelin interpreter process jvm options. Default = ZEPPELIN_JAVA_OPTS
-# export ZEPPELIN_INTP_JAVA_OPTS
-
-# Where notebook saved
-# export ZEPPELIN_NOTEBOOK_DIR
-
-# Id of notebook to be displayed in homescreen. ex) 2A94M5J1Z
-# export ZEPPELIN_NOTEBOOK_HOMESCREEN
-
-# hide homescreen notebook from list when this value set to "true". default
"false"
-# export ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE
-
-# Bucket where notebook saved
-# export ZEPPELIN_NOTEBOOK_S3_BUCKET
-
-# User in bucket where notebook saved. For example
bucket/user/notebook/2A94M5J1Z/note.json
-# export ZEPPELIN_NOTEBOOK_S3_USER
-
-# A string representing this instance of zeppelin. $USER by default
-# export ZEPPELIN_IDENT_STRING
-
-# The scheduling priority for daemons. Defaults to 0.
-# export ZEPPELIN_NICENESS
-
+# export ZEPPELIN_WAR_TEMPDIR # The location of jetty
temporary directory.
+# export ZEPPELIN_NOTEBOOK_DIR# Where notebook saved
+# export ZEPPELIN_NOTEBOOK_HOMESCREEN # Id of notebook to be displayed
in homescreen. ex) 2A94M5J1Z
+# export ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE# hide homescreen notebook from
list when this value set to "
[2/2] ambari git commit: AMBARI-19123 Update zeppelin configuration for ambari 2.5 (prabhjyotsingh)
AMBARI-19123 Update zeppelin configuration for ambari 2.5 (prabhjyotsingh)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61255aff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61255aff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61255aff
Branch: refs/heads/trunk
Commit: 61255affedf34ea0c29bfe513945e81f4a1d6a74
Parents: b77b2fa
Author: Renjith Kamath
Authored: Thu Dec 15 12:07:18 2016 +0530
Committer: Renjith Kamath
Committed: Thu Dec 15 12:08:47 2016 +0530
--
.../0.6.0.2.5/configuration/zeppelin-env.xml| 163 ++-
1 file changed, 88 insertions(+), 75 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/61255aff/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index 317ad73..2beac97 100644
---
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -60,94 +60,80 @@
zeppelin_env_content
This is the jinja template for zeppelin-env.sh
file
-# Spark master url. eg. spark://master_addr:7077. Leave empty if you want to
use local mode
+# export JAVA_HOME=
+export JAVA_HOME={{java64_home}}
+# export MASTER= # Spark master url. eg.
spark://master_addr:7077. Leave empty if you want to use local mode.
export MASTER=yarn-client
export SPARK_YARN_JAR={{spark_jar}}
+# export ZEPPELIN_JAVA_OPTS # Additional jvm options. for
example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g
-Dspark.cores.max=16"
+export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory={{executor_mem}}
-Dspark.executor.instances={{executor_instances}}
-Dspark.yarn.queue={{spark_queue}}"
+# export ZEPPELIN_MEM # Zeppelin jvm mem options
Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
+# export ZEPPELIN_INTP_MEM# zeppelin interpreter process
jvm mem options. Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
+# export ZEPPELIN_INTP_JAVA_OPTS # zeppelin interpreter process
jvm options.
+# export ZEPPELIN_SSL_PORT# ssl port (used when ssl
environment variable is set to true)
-
-# Where log files are stored. PWD by default.
+# export ZEPPELIN_LOG_DIR # Where log files are stored.
PWD by default.
export ZEPPELIN_LOG_DIR={{zeppelin_log_dir}}
-
-# The pid files are stored. /tmp by default.
+# export ZEPPELIN_PID_DIR # The pid files are stored.
${ZEPPELIN_HOME}/run by default.
export ZEPPELIN_PID_DIR={{zeppelin_pid_dir}}
-
-
-export JAVA_HOME={{java64_home}}
-
-# Additional jvm options. for example, export
ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16"
-export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory={{executor_mem}}
-Dspark.executor.instances={{executor_instances}}
-Dspark.yarn.queue={{spark_queue}}"
-
-
-# Zeppelin jvm mem options Default -Xmx1024m -XX:MaxPermSize=512m
-# export ZEPPELIN_MEM
-
-# zeppelin interpreter process jvm mem options. Defualt = ZEPPELIN_MEM
-# export ZEPPELIN_INTP_MEM
-
-# zeppelin interpreter process jvm options. Default = ZEPPELIN_JAVA_OPTS
-# export ZEPPELIN_INTP_JAVA_OPTS
-
-# Where notebook saved
-# export ZEPPELIN_NOTEBOOK_DIR
-
-# Id of notebook to be displayed in homescreen. ex) 2A94M5J1Z
-# export ZEPPELIN_NOTEBOOK_HOMESCREEN
-
-# hide homescreen notebook from list when this value set to "true". default
"false"
-# export ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE
-
-# Bucket where notebook saved
-# export ZEPPELIN_NOTEBOOK_S3_BUCKET
-
-# User in bucket where notebook saved. For example
bucket/user/notebook/2A94M5J1Z/note.json
-# export ZEPPELIN_NOTEBOOK_S3_USER
-
-# A string representing this instance of zeppelin. $USER by default
-# export ZEPPELIN_IDENT_STRING
-
-# The scheduling priority for daemons. Defaults to 0.
-# export ZEPPELIN_NICENESS
-
+# export ZEPPELIN_WAR_TEMPDIR # The location of jetty
temporary directory.
+# export ZEPPELIN_NOTEBOOK_DIR# Where notebook saved
+# export ZEPPELIN_NOTEBOOK_HOMESCREEN # Id of notebook to be displayed
in homescreen. ex) 2A94M5J1Z
+# export ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE# hide homescreen notebook from
list when this value set to "true". default "false"
+# export ZEPPELIN_NOTEBOOK_S3_BUCKET # Bucket where notebook saved
+# export ZEPPELIN_NOTEBOOK_S3_EN
[1/2] ambari git commit: AMBARI-19126 Spark 2.x interpreter confgurations in Zeppelin (r-kamath)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 a74bf6b2b -> 2d8a77642
refs/heads/trunk f936fd04d -> b77b2fac3
AMBARI-19126 Spark 2.x interpreter confgurations in Zeppelin (r-kamath)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2d8a7764
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2d8a7764
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2d8a7764
Branch: refs/heads/branch-2.5
Commit: 2d8a776423f341e5a0282a28a1c663c5bb758d08
Parents: a74bf6b
Author: Renjith Kamath
Authored: Thu Dec 15 11:57:34 2016 +0530
Committer: Renjith Kamath
Committed: Thu Dec 15 11:57:34 2016 +0530
--
.../0.6.0.2.5/configuration/zeppelin-env.xml| 2 +-
.../0.6.0.2.5/package/scripts/master.py | 108 +++
.../0.6.0.2.5/package/scripts/params.py | 4 +-
.../package/scripts/spark2_config_template.py | 64 +++
4 files changed, 133 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2d8a7764/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index c03d2dc..317ad73 100644
---
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -115,7 +115,7 @@ export
ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory={{executor_mem}} -Dspark.exec
## defining SPARK_HOME makes Zeppelin run spark interpreter process using
spark-submit
##
# (required) When it is defined, load it instead of Zeppelin embedded Spark
libraries
-export SPARK_HOME={{spark_home}}
+#export SPARK_HOME={{spark_home}}
# (optional) extra options to pass to spark submit. eg) "--driver-memory 512M
--executor-memory 1G".
# export SPARK_SUBMIT_OPTIONS
http://git-wip-us.apache.org/repos/asf/ambari/blob/2d8a7764/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
--
diff --git
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index e82b53c..9cc808b 100644
---
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -237,40 +237,40 @@ class Master(Script):
import params
config_data = self.get_interpreter_settings()
interpreter_settings = config_data['interpreterSettings']
-for notebooks in interpreter_settings:
- notebook = interpreter_settings[notebooks]
- if notebook['group'] == 'livy' and params.livy_livyserver_host:
+for interpreter_setting in interpreter_settings:
+ interpreter = interpreter_settings[interpreter_setting]
+ if interpreter['group'] == 'livy' and params.livy_livyserver_host:
if params.zeppelin_kerberos_principal and
params.zeppelin_kerberos_keytab and params.security_enabled:
- notebook['properties']['zeppelin.livy.principal'] =
params.zeppelin_kerberos_principal
- notebook['properties']['zeppelin.livy.keytab'] =
params.zeppelin_kerberos_keytab
+ interpreter['properties']['zeppelin.livy.principal'] =
params.zeppelin_kerberos_principal
+ interpreter['properties']['zeppelin.livy.keytab'] =
params.zeppelin_kerberos_keytab
else:
- notebook['properties']['zeppelin.livy.principal'] = ""
- notebook['properties']['zeppelin.livy.keytab'] = ""
- elif notebook['group'] == 'spark':
+ interpreter['properties']['zeppelin.livy.principal'] = ""
+ interpreter['properties']['zeppelin.livy.keytab'] = ""
+ elif interpreter['group'] == 'spark':
if params.zeppelin_kerberos_principal and
params.zeppelin_kerberos_keytab and params.security_enabled:
- notebook['properties']['spark.yarn.principal'] =
params.zeppelin_kerberos_principal
- notebook['properties']['spark.yarn.keytab'] =
params.zeppelin_kerberos_keytab
+ interpreter['properties']['spark.yarn.principal'] =
params.zeppelin_kerberos_principal
+ interpreter['properties']['spark.yarn.keytab'] =
params.zeppelin_kerberos_keytab
else:
- notebook['properties']['spark.yarn.principal'] = ""
- notebook['properties']['sp
[2/2] ambari git commit: AMBARI-19126 Spark 2.x interpreter confgurations in Zeppelin (r-kamath)
AMBARI-19126 Spark 2.x interpreter confgurations in Zeppelin (r-kamath)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b77b2fac
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b77b2fac
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b77b2fac
Branch: refs/heads/trunk
Commit: b77b2fac39bc06df1d5b6a59d1be4d6bdd8b0386
Parents: f936fd0
Author: Renjith Kamath
Authored: Thu Dec 15 11:57:34 2016 +0530
Committer: Renjith Kamath
Committed: Thu Dec 15 11:59:13 2016 +0530
--
.../0.6.0.2.5/configuration/zeppelin-env.xml| 2 +-
.../0.6.0.2.5/package/scripts/master.py | 108 +++
.../0.6.0.2.5/package/scripts/params.py | 4 +-
.../package/scripts/spark2_config_template.py | 64 +++
4 files changed, 133 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b77b2fac/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index c03d2dc..317ad73 100644
---
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -115,7 +115,7 @@ export
ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory={{executor_mem}} -Dspark.exec
## defining SPARK_HOME makes Zeppelin run spark interpreter process using
spark-submit
##
# (required) When it is defined, load it instead of Zeppelin embedded Spark
libraries
-export SPARK_HOME={{spark_home}}
+#export SPARK_HOME={{spark_home}}
# (optional) extra options to pass to spark submit. eg) "--driver-memory 512M
--executor-memory 1G".
# export SPARK_SUBMIT_OPTIONS
http://git-wip-us.apache.org/repos/asf/ambari/blob/b77b2fac/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
--
diff --git
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
index e82b53c..9cc808b 100644
---
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
+++
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py
@@ -237,40 +237,40 @@ class Master(Script):
import params
config_data = self.get_interpreter_settings()
interpreter_settings = config_data['interpreterSettings']
-for notebooks in interpreter_settings:
- notebook = interpreter_settings[notebooks]
- if notebook['group'] == 'livy' and params.livy_livyserver_host:
+for interpreter_setting in interpreter_settings:
+ interpreter = interpreter_settings[interpreter_setting]
+ if interpreter['group'] == 'livy' and params.livy_livyserver_host:
if params.zeppelin_kerberos_principal and
params.zeppelin_kerberos_keytab and params.security_enabled:
- notebook['properties']['zeppelin.livy.principal'] =
params.zeppelin_kerberos_principal
- notebook['properties']['zeppelin.livy.keytab'] =
params.zeppelin_kerberos_keytab
+ interpreter['properties']['zeppelin.livy.principal'] =
params.zeppelin_kerberos_principal
+ interpreter['properties']['zeppelin.livy.keytab'] =
params.zeppelin_kerberos_keytab
else:
- notebook['properties']['zeppelin.livy.principal'] = ""
- notebook['properties']['zeppelin.livy.keytab'] = ""
- elif notebook['group'] == 'spark':
+ interpreter['properties']['zeppelin.livy.principal'] = ""
+ interpreter['properties']['zeppelin.livy.keytab'] = ""
+ elif interpreter['group'] == 'spark':
if params.zeppelin_kerberos_principal and
params.zeppelin_kerberos_keytab and params.security_enabled:
- notebook['properties']['spark.yarn.principal'] =
params.zeppelin_kerberos_principal
- notebook['properties']['spark.yarn.keytab'] =
params.zeppelin_kerberos_keytab
+ interpreter['properties']['spark.yarn.principal'] =
params.zeppelin_kerberos_principal
+ interpreter['properties']['spark.yarn.keytab'] =
params.zeppelin_kerberos_keytab
else:
- notebook['properties']['spark.yarn.principal'] = ""
- notebook['properties']['spark.yarn.keytab'] = ""
- elif notebook['group'] == 'jdbc':
+ interpreter['properties']['spark.yarn.principal'] = ""
+
ambari git commit: AMBARI-19156 Install Packages fails with the old stack has services removed in the new stack (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 98c5d9844 -> a74bf6b2b
AMBARI-19156 Install Packages fails with the old stack has services removed in
the new stack (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a74bf6b2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a74bf6b2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a74bf6b2
Branch: refs/heads/branch-2.5
Commit: a74bf6b2b943642d579f497747adf385ae2340a1
Parents: 98c5d98
Author: Di Li
Authored: Wed Dec 14 15:08:13 2016 -0500
Committer: Di Li
Committed: Wed Dec 14 16:01:12 2016 -0500
--
.../server/api/services/AmbariMetaInfo.java | 6
.../ClusterStackVersionResourceProvider.java| 9 +
.../apache/ambari/server/stack/BaseModule.java | 2 +-
.../ambari/server/stack/ExtensionModule.java| 6 ++--
.../ambari/server/stack/ServiceModule.java | 6 ++--
.../apache/ambari/server/stack/StackModule.java | 20 ---
.../apache/ambari/server/state/StackInfo.java | 12 +++
.../AmbariManagementControllerTest.java | 2 +-
.../ambari/server/stack/StackManagerTest.java | 38 ++--
.../ambari/server/stack/StackModuleTest.java| 11 ++
.../HDP/2.0.6/services/SPARK/metainfo.xml | 33 +
.../HDP/2.0.7/services/SPARK/metainfo.xml | 34 ++
.../HDP/2.0.7/services/SPARK2/metainfo.xml | 33 +
.../HDP/2.0.8/services/SPARK2/metainfo.xml | 34 ++
.../HDP/2.0.8/services/SPARK3/metainfo.xml | 33 +
15 files changed, 265 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a74bf6b2/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 92d47df..2d13cba 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -540,6 +540,12 @@ public class AmbariMetaInfo {
return service;
}
+ public boolean isServiceRemovedInStack(String stackName, String version,
String serviceName) throws AmbariException{
+StackInfo stack = getStack(stackName, version);
+List removedServices = stack.getRemovedServices();
+return removedServices.contains(serviceName);
+ }
+
public Collection getMonitoringServiceNames(String stackName, String
version)
throws AmbariException{
http://git-wip-us.apache.org/repos/asf/ambari/blob/a74bf6b2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index d417ec2..f2fd9ac 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -626,6 +626,15 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
}
List blacklistedPackagePrefixes =
configuration.getRollingUpgradeSkipPackagesPrefixes();
for (String serviceName : servicesOnHost) {
+ try{
+if(ami.isServiceRemovedInStack(stackId.getStackName(),
stackId.getStackVersion(), serviceName)){
+ LOG.info(String.format("%s has been removed from stack %s-%s. Skip
calculating its installation packages", stackId.getStackName(),
stackId.getStackVersion(), serviceName));
+ continue; //No need to calculate install packages for removed
services
+}
+ } catch (AmbariException e1) {
+throw new SystemException(String.format("Cannot obtain stack
information for %s-%s", stackId.getStackName(), stackId.getStackVersion()), e1);
+ }
+
ServiceInfo info;
try {
info = ami.getService(stackId.getStackName(),
stackId.getStackVersion(), serviceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/a74bf6b2/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java
b/amba
ambari git commit: AMBARI-14958. Alerts: Create new Alerts Notification type for SNMP to handle Ambari MIB. (Vivek Subramanian via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk 162ee83c5 -> f936fd04d
AMBARI-14958. Alerts: Create new Alerts Notification type for SNMP to handle
Ambari MIB. (Vivek Subramanian via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f936fd04
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f936fd04
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f936fd04
Branch: refs/heads/trunk
Commit: f936fd04ddbffa0cd78e827d61c2a27c4be1270c
Parents: 162ee83
Author: Yusaku Sako
Authored: Wed Dec 14 12:43:53 2016 -0800
Committer: Yusaku Sako
Committed: Wed Dec 14 12:43:53 2016 -0800
--
.../manage_alert_notifications_controller.js| 36 +-
.../main/alerts/create_alert_notification.hbs | 72 +---
.../alerts/manage_alert_notifications_view.js | 6 ++
3 files changed, 101 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f936fd04/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
--
diff --git
a/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
b/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
index 10a7918..466d2e1 100644
---
a/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
+++
b/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
@@ -167,7 +167,7 @@ App.ManageAlertNotificationsController =
Em.Controller.extend({
* used in Type combobox
* @type {Array}
*/
- methods: ['EMAIL', 'SNMP'],
+ methods: ['EMAIL', 'SNMP', 'Custom SNMP'],
/**
* List of available value for Severity Filter
@@ -321,6 +321,16 @@ App.ManageAlertNotificationsController =
Em.Controller.extend({
errorKey: 'hostError',
validator: 'hostsValidation'
}
+],
+CustomSNMP: [
+ {
+errorKey: 'portError',
+validator: 'portValidation'
+ },
+ {
+errorKey: 'hostError',
+validator: 'hostsValidation'
+ }
]
},
@@ -461,11 +471,17 @@ App.ManageAlertNotificationsController =
Em.Controller.extend({
isEmailMethodSelected:
Em.computed.equal('controller.inputFields.method.value', 'EMAIL'),
+isSNMPMethodSelected:
Em.computed.equal('controller.inputFields.method.value', 'SNMP'),
+
+isCustomSNMPMethodSelected:
Em.computed.equal('controller.inputFields.method.value', 'Custom SNMP'),
+
methodObserver: function () {
var currentMethod = this.get('controller.inputFields.method.value'),
validationMap = self.get('validationMap');
self.get('methods').forEach(function (method) {
-var validations = validationMap[method];
+// Replace blank spaces with empty character
+var mapKey = method.replace(/\s/g, "");
+var validations = validationMap[mapKey];
if (method === currentMethod) {
validations.mapProperty('validator').forEach(function (key) {
this.get(key).call(this);
@@ -745,6 +761,11 @@ App.ManageAlertNotificationsController =
Em.Controller.extend({
properties['ambari.dispatch.credential.password'] =
inputFields.get('SMTPPassword.value');
properties['mail.smtp.starttls.enable'] =
inputFields.get('SMTPSTARTTLS.value');
}
+} else if(inputFields.get('method.value') === 'SNMP') {
+ properties['ambari.dispatch.snmp.version'] =
inputFields.get('version.value');
+ properties['ambari.dispatch.snmp.community'] =
inputFields.get('community.value');
+ properties['ambari.dispatch.recipients'] =
inputFields.get('host.value').replace(/\s/g, '').split(',');
+ properties['ambari.dispatch.snmp.port'] = inputFields.get('port.value');
} else {
properties['ambari.dispatch.snmp.version'] =
inputFields.get('version.value');
properties['ambari.dispatch.snmp.oids.trap'] =
inputFields.get('OIDs.value');
@@ -757,12 +778,21 @@ App.ManageAlertNotificationsController =
Em.Controller.extend({
inputFields.get('customProperties').forEach(function (customProperty) {
properties[customProperty.name] = customProperty.value;
});
+var getNotificationType = function() {
+ var methodValue = inputFields.get('method.value');
+ if(methodValue == "Custom SNMP") {
+methodValue = "SNMP";
+ } else if(methodValue == "SNMP") {
+methodValue = "AMBARI_SNMP"
+ }
+ return methodValue;
+};
var apiObject = {
AlertTarget: {
name: inputFields.get('name.value'),
description: inputFields.get('description.value'),
global: inputFields.get('allGroups.value') ==
ambari git commit: AMBARI-19156 Install Packages fails with the old stack has services removed in the new stack (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 7dcabf565 -> 162ee83c5
AMBARI-19156 Install Packages fails with the old stack has services removed in
the new stack (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/162ee83c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/162ee83c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/162ee83c
Branch: refs/heads/trunk
Commit: 162ee83c552e2c418cc2ee97dbb3687ffc8e1ae3
Parents: 7dcabf5
Author: Di Li
Authored: Wed Dec 14 15:08:13 2016 -0500
Committer: Di Li
Committed: Wed Dec 14 15:08:13 2016 -0500
--
.../server/api/services/AmbariMetaInfo.java | 6
.../ClusterStackVersionResourceProvider.java| 9 +
.../apache/ambari/server/stack/BaseModule.java | 2 +-
.../ambari/server/stack/ExtensionModule.java| 6 ++--
.../ambari/server/stack/ServiceModule.java | 6 ++--
.../apache/ambari/server/stack/StackModule.java | 20 ---
.../apache/ambari/server/state/StackInfo.java | 12 +++
.../AmbariManagementControllerTest.java | 2 +-
.../ambari/server/stack/StackManagerTest.java | 38 ++--
.../ambari/server/stack/StackModuleTest.java| 11 ++
.../HDP/2.0.6/services/SPARK/metainfo.xml | 33 +
.../HDP/2.0.7/services/SPARK/metainfo.xml | 34 ++
.../HDP/2.0.7/services/SPARK2/metainfo.xml | 33 +
.../HDP/2.0.8/services/SPARK2/metainfo.xml | 34 ++
.../HDP/2.0.8/services/SPARK3/metainfo.xml | 33 +
15 files changed, 265 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/162ee83c/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 23a4a27..13f3b9a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -549,6 +549,12 @@ public class AmbariMetaInfo {
return service;
}
+ public boolean isServiceRemovedInStack(String stackName, String version,
String serviceName) throws AmbariException{
+StackInfo stack = getStack(stackName, version);
+List removedServices = stack.getRemovedServices();
+return removedServices.contains(serviceName);
+ }
+
public Collection getMonitoringServiceNames(String stackName, String
version)
throws AmbariException{
http://git-wip-us.apache.org/repos/asf/ambari/blob/162ee83c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index d417ec2..f2fd9ac 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -626,6 +626,15 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
}
List blacklistedPackagePrefixes =
configuration.getRollingUpgradeSkipPackagesPrefixes();
for (String serviceName : servicesOnHost) {
+ try{
+if(ami.isServiceRemovedInStack(stackId.getStackName(),
stackId.getStackVersion(), serviceName)){
+ LOG.info(String.format("%s has been removed from stack %s-%s. Skip
calculating its installation packages", stackId.getStackName(),
stackId.getStackVersion(), serviceName));
+ continue; //No need to calculate install packages for removed
services
+}
+ } catch (AmbariException e1) {
+throw new SystemException(String.format("Cannot obtain stack
information for %s-%s", stackId.getStackName(), stackId.getStackVersion()), e1);
+ }
+
ServiceInfo info;
try {
info = ami.getService(stackId.getStackName(),
stackId.getStackVersion(), serviceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/162ee83c/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java
b/ambari-server/
ambari git commit: AMBARI-17591 : Collect JVM Heap, GC and thread pool metrics from Ambari Server and push to AMS (Li-Wei Tseng via avijayan)
Repository: ambari Updated Branches: refs/heads/branch-2.5 0d2ceecd2 -> 98c5d9844 AMBARI-17591 : Collect JVM Heap, GC and thread pool metrics from Ambari Server and push to AMS (Li-Wei Tseng via avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98c5d984 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98c5d984 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98c5d984 Branch: refs/heads/branch-2.5 Commit: 98c5d98442099799f961736b7f7264e6f84b5858 Parents: 0d2ceec Author: Aravindan Vijayan Authored: Wed Dec 14 10:51:46 2016 -0800 Committer: Aravindan Vijayan Committed: Wed Dec 14 10:51:46 2016 -0800 -- ambari-server/conf/unix/metrics.properties | 31 + ambari-server/pom.xml | 10 + .../ambari/server/controller/AmbariServer.java | 13 + .../server/controller/ControllerModule.java | 4 + .../server/metrics/system/AmbariMetricSink.java | 34 + .../server/metrics/system/MetricsService.java | 26 + .../server/metrics/system/MetricsSource.java| 25 + .../system/impl/AbstractMetricsSource.java | 41 ++ .../system/impl/AmbariMetricSinkImpl.java | 168 + .../metrics/system/impl/Configuration.java | 83 +++ .../metrics/system/impl/JvmMetricsSource.java | 75 ++ .../metrics/system/impl/MetricsServiceImpl.java | 168 + .../default/grafana-ambari-server.json | 691 +++ 13 files changed, 1369 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/98c5d984/ambari-server/conf/unix/metrics.properties -- diff --git a/ambari-server/conf/unix/metrics.properties b/ambari-server/conf/unix/metrics.properties new file mode 100644 index 000..5f01e39 --- /dev/null +++ b/ambari-server/conf/unix/metrics.properties @@ -0,0 +1,31 @@ +# Copyright 2011 The Apache Software Foundation +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# Metrics sources info +metrics.sources=jvm + +# Source interval determines how often the metric is sent to sink. Its unit is in seconds +source.jvm.interval=5 +source.jvm.class=org.apache.ambari.server.metrics.system.impl.JvmMetricsSource + +#source.database.interval=10 +#source.database.class=org.apache.ambari.server.metrics.system.impl.DbMetricSource + +# Sink frequency determines how often the sink publish the metrics from buffer to AMS. +sink.frequency=10 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/98c5d984/ambari-server/pom.xml -- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 6307a14..fcb6fcd 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -1471,6 +1471,16 @@ jna 4.1.0 + + io.dropwizard.metrics + metrics-core + 3.1.0 + + + io.dropwizard.metrics + metrics-jvm + 3.1.0 + http://git-wip-us.apache.org/repos/asf/ambari/blob/98c5d984/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java index 23f9dcc..dcc56c9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java @@ -75,6 +75,7 @@ import org.apache.ambari.server.controller.internal.UserPrivilegeResourceProvide import org.apache.ambari.server.controller.internal.ViewPermissionResourceProvider; import org.apache.ambari.server.controller.metrics.ThreadPoolEnabledPropertyProvider; import org.apache.ambari.server.controller.utilities.KerberosChecker; +import org.apache.ambari.server.metrics.system.MetricsService; import org.apache.ambari.server.orm.GuiceJpaInitializer; im
[2/2] ambari git commit: AMBARI-19203. LLAP app package cleanup fails after Hive Interactive start failure in non-root (aonishuk)
AMBARI-19203. LLAP app package cleanup fails after Hive Interactive start
failure in non-root (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0d2ceecd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0d2ceecd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0d2ceecd
Branch: refs/heads/branch-2.5
Commit: 0d2ceecd2a3bceca26d783ad5db8b78472c83708
Parents: 10cb81a
Author: Andrew Onishuk
Authored: Wed Dec 14 20:07:42 2016 +0200
Committer: Andrew Onishuk
Committed: Wed Dec 14 20:07:42 2016 +0200
--
.../package/scripts/hive_server_interactive.py | 25 ++--
1 file changed, 12 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0d2ceecd/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
index 055c690..f2f0554 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
@@ -31,7 +31,7 @@ from resource_management.libraries.script.script import Script
from resource_management.libraries.functions import format
from resource_management.libraries.functions.check_process_status import
check_process_status
from resource_management.core.source import InlineTemplate
-from resource_management.core.resources.system import Execute
+from resource_management.core.resources.system import Execute, Directory
# Imports needed for Rolling/Express Upgrade
from resource_management.libraries.functions import StackFeature
@@ -345,12 +345,11 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
except:
# Attempt to clean up the packaged application, or potentially rename
it with a .bak
if run_file_path is not None and cleanup:
- try:
-parent_dir = os.path.dirname(run_file_path)
-if os.path.isdir(parent_dir):
- shutil.rmtree(parent_dir)
- except Exception, e:
-Logger.error("Could not cleanup LLAP app package. Error: " +
str(e))
+ parent_dir = os.path.dirname(run_file_path)
+ Directory(parent_dir,
+action = "delete",
+ignore_failures = True,
+ )
# throw the original exception
raise
@@ -376,14 +375,14 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
if file_names:
for path in file_names:
abs_path = Script.get_tmp_dir()+"/"+path
-if os.path.isdir(abs_path):
- shutil.rmtree(abs_path)
- Logger.info("Deleted previous run 'LLAP package' folder :
{0}".format(abs_path))
+Directory(abs_path,
+ action = "delete",
+ ignore_failures = True
+)
else:
Logger.info("No '{0}*' folder
deleted.".format(llap_package_folder_name_prefix))
- except Exception as e:
-Logger.info("Exception while doing cleanup for past 'LLAP
package(s)'.")
-traceback.print_exc()
+ except:
+Logger.exception("Exception while doing cleanup for past 'LLAP
package(s)':")
[1/2] ambari git commit: AMBARI-19203. LLAP app package cleanup fails after Hive Interactive start failure in non-root (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 10cb81af4 -> 0d2ceecd2
refs/heads/trunk cb8182e9a -> 7dcabf565
AMBARI-19203. LLAP app package cleanup fails after Hive Interactive start
failure in non-root (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7dcabf56
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7dcabf56
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7dcabf56
Branch: refs/heads/trunk
Commit: 7dcabf5656963a2b81dae13fa03ac51638b1eb26
Parents: cb8182e
Author: Andrew Onishuk
Authored: Wed Dec 14 20:07:39 2016 +0200
Committer: Andrew Onishuk
Committed: Wed Dec 14 20:07:39 2016 +0200
--
.../package/scripts/hive_server_interactive.py | 25 ++--
1 file changed, 12 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7dcabf56/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
index e04c53c..8c48edc 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
@@ -31,7 +31,7 @@ from resource_management.libraries.script.script import Script
from resource_management.libraries.functions import format
from resource_management.libraries.functions.check_process_status import
check_process_status
from resource_management.core.source import InlineTemplate
-from resource_management.core.resources.system import Execute
+from resource_management.core.resources.system import Execute, Directory
# Imports needed for Rolling/Express Upgrade
from resource_management.libraries.functions import StackFeature
@@ -344,12 +344,11 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
except:
# Attempt to clean up the packaged application, or potentially rename
it with a .bak
if run_file_path is not None and cleanup:
- try:
-parent_dir = os.path.dirname(run_file_path)
-if os.path.isdir(parent_dir):
- shutil.rmtree(parent_dir)
- except Exception, e:
-Logger.error("Could not cleanup LLAP app package. Error: " +
str(e))
+ parent_dir = os.path.dirname(run_file_path)
+ Directory(parent_dir,
+action = "delete",
+ignore_failures = True,
+ )
# throw the original exception
raise
@@ -375,14 +374,14 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
if file_names:
for path in file_names:
abs_path = Script.get_tmp_dir()+"/"+path
-if os.path.isdir(abs_path):
- shutil.rmtree(abs_path)
- Logger.info("Deleted previous run 'LLAP package' folder :
{0}".format(abs_path))
+Directory(abs_path,
+ action = "delete",
+ ignore_failures = True
+)
else:
Logger.info("No '{0}*' folder
deleted.".format(llap_package_folder_name_prefix))
- except Exception as e:
-Logger.info("Exception while doing cleanup for past 'LLAP
package(s)'.")
-traceback.print_exc()
+ except:
+Logger.exception("Exception while doing cleanup for past 'LLAP
package(s)':")
[1/2] ambari git commit: AMBARI-19127. hbase_regionserver_shutdown_timeout should be editable all the time (aonishuk)
Repository: ambari Updated Branches: refs/heads/branch-2.5 ecc916bbc -> 10cb81af4 refs/heads/trunk db9dfd60a -> cb8182e9a AMBARI-19127. hbase_regionserver_shutdown_timeout should be editable all the time (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cb8182e9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cb8182e9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cb8182e9 Branch: refs/heads/trunk Commit: cb8182e9adaaa29427f4a8d95a04e50f55fde2e8 Parents: db9dfd6 Author: Andrew Onishuk Authored: Wed Dec 14 20:04:42 2016 +0200 Committer: Andrew Onishuk Committed: Wed Dec 14 20:04:42 2016 +0200 -- .../AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml| 1 - .../common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml| 1 - 2 files changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/cb8182e9/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml index eb63c9f..db36db8 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml @@ -171,7 +171,6 @@ The timeout is introduced because there is a known bug when from time to time HB int false - true http://git-wip-us.apache.org/repos/asf/ambari/blob/cb8182e9/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml index 24bd563..2ab6aa0 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml @@ -150,7 +150,6 @@ The timeout is introduced because there is a known bug when from time to time HB int false - true
[2/2] ambari git commit: AMBARI-19127. hbase_regionserver_shutdown_timeout should be editable all the time (aonishuk)
AMBARI-19127. hbase_regionserver_shutdown_timeout should be editable all the time (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10cb81af Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10cb81af Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10cb81af Branch: refs/heads/branch-2.5 Commit: 10cb81af4fb0ae21391db489485a93398b92bca5 Parents: ecc916b Author: Andrew Onishuk Authored: Wed Dec 14 20:04:46 2016 +0200 Committer: Andrew Onishuk Committed: Wed Dec 14 20:04:46 2016 +0200 -- .../AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml| 1 - .../common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml| 1 - 2 files changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/10cb81af/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml index 80fd95c..a620c5b 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml @@ -168,7 +168,6 @@ The timeout is introduced because there is a known bug when from time to time HB int false - true http://git-wip-us.apache.org/repos/asf/ambari/blob/10cb81af/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml index 24bd563..2ab6aa0 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml @@ -150,7 +150,6 @@ The timeout is introduced because there is a known bug when from time to time HB int false - true
[1/2] ambari git commit: AMBARI-17666. Ambari agent can't start when TLSv1 is disabled in Java security (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 e1f7795ba -> ecc916bbc
refs/heads/trunk 30511fad8 -> db9dfd60a
AMBARI-17666. Ambari agent can't start when TLSv1 is disabled in Java security
(dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/db9dfd60
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/db9dfd60
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/db9dfd60
Branch: refs/heads/trunk
Commit: db9dfd60a1930c3ee18322179a1ebe3d795263e8
Parents: 30511fa
Author: Lisnichenko Dmitro
Authored: Wed Dec 14 19:10:56 2016 +0200
Committer: Lisnichenko Dmitro
Committed: Wed Dec 14 19:10:56 2016 +0200
--
.../main/python/ambari_agent/AmbariConfig.py| 31 +---
.../ambari_agent/CustomServiceOrchestrator.py | 4 ++-
.../src/main/python/ambari_agent/NetUtil.py | 3 ++
.../python/ambari_agent/alerts/web_alert.py | 7 +++--
.../TestCustomServiceOrchestrator.py| 4 +--
.../main/python/ambari_commons/inet_utils.py| 7 +++--
.../libraries/script/script.py | 15 --
.../HDFS/2.1.0.2.0/package/files/checkWebUI.py | 15 ++
.../HDFS/2.1.0.2.0/package/scripts/params.py| 1 +
.../2.1.0.2.0/package/scripts/service_check.py | 3 +-
.../HDFS/2.1.0.2.0/package/scripts/utils.py | 5 ++--
.../0.8/services/HDFS/package/scripts/params.py | 1 +
.../HDFS/package/scripts/service_check.py | 2 +-
13 files changed, 66 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/db9dfd60/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
index a097f37..64c2643 100644
--- a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
+++ b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
@@ -23,7 +23,6 @@ import ConfigParser
import StringIO
import hostname
import ambari_simplejson as json
-from NetUtil import NetUtil
import os
from ambari_commons import OSConst
@@ -159,7 +158,6 @@ class AmbariConfig:
def __init__(self):
global content
self.config = ConfigParser.RawConfigParser()
-self.net = NetUtil(self)
self.config.readfp(StringIO.StringIO(content))
def get(self, section, value, default=None):
@@ -185,13 +183,22 @@ class AmbariConfig:
def getConfig(self):
return self.config
- @staticmethod
- @OsFamilyFuncImpl(OSConst.WINSRV_FAMILY)
- def getConfigFile(home_dir=""):
-if 'AMBARI_AGENT_CONF_DIR' in os.environ:
- return os.path.join(os.environ['AMBARI_AGENT_CONF_DIR'],
"ambari-agent.ini")
-else:
- return "ambari-agent.ini"
+ @classmethod
+ def get_resolved_config(cls, home_dir=""):
+if hasattr(cls, "_conf_cache"):
+ return getattr(cls, "_conf_cache")
+config = cls()
+configPath = os.path.abspath(cls.getConfigFile(home_dir))
+try:
+ if os.path.exists(configPath):
+config.read(configPath)
+ else:
+raise Exception("No config found at {0}, use
default".format(configPath))
+
+except Exception, err:
+ logger.warn(err)
+setattr(cls, "_conf_cache", config)
+return config
@staticmethod
@OsFamilyFuncImpl(OsFamilyImpl.DEFAULT)
@@ -259,7 +266,8 @@ class AmbariConfig:
self.config.read(filename)
def getServerOption(self, url, name, default=None):
-status, response = self.net.checkURL(url)
+from ambari_agent.NetUtil import NetUtil
+status, response = NetUtil(self).checkURL(url)
if status is True:
try:
data = json.loads(response)
@@ -305,6 +313,9 @@ class AmbariConfig:
logger.info("Updating config property (%s) with value (%s)", k, v)
pass
+ def get_force_https_protocol(self):
+return self.get('security', 'force_https_protocol',
default="PROTOCOL_TLSv1")
+
def isSameHostList(hostlist1, hostlist2):
is_same = True
http://git-wip-us.apache.org/repos/asf/ambari/blob/db9dfd60/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index 5fd3068..02f4212 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -78,6 +78,7 @@ class CustomServiceOrchestrator():
def __init__(self, config, controller):
self.config = config
self.tmp_dir = config.get('agent', 'prefix')
+self.force_https_protocol = config.get_fo
[2/2] ambari git commit: AMBARI-17666. Ambari agent can't start when TLSv1 is disabled in Java security (dlysnichenko)
AMBARI-17666. Ambari agent can't start when TLSv1 is disabled in Java security
(dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ecc916bb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ecc916bb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ecc916bb
Branch: refs/heads/branch-2.5
Commit: ecc916bbc1345e0dbc80ee1bd3a42f8545bc52f2
Parents: e1f7795
Author: Lisnichenko Dmitro
Authored: Wed Dec 14 19:11:52 2016 +0200
Committer: Lisnichenko Dmitro
Committed: Wed Dec 14 19:11:52 2016 +0200
--
.../main/python/ambari_agent/AmbariConfig.py| 31 +---
.../ambari_agent/CustomServiceOrchestrator.py | 4 ++-
.../src/main/python/ambari_agent/NetUtil.py | 3 ++
.../python/ambari_agent/alerts/web_alert.py | 7 +++--
.../TestCustomServiceOrchestrator.py| 4 +--
.../main/python/ambari_commons/inet_utils.py| 7 +++--
.../libraries/script/script.py | 15 --
.../HDFS/2.1.0.2.0/package/files/checkWebUI.py | 15 ++
.../HDFS/2.1.0.2.0/package/scripts/params.py| 1 +
.../2.1.0.2.0/package/scripts/service_check.py | 3 +-
.../HDFS/2.1.0.2.0/package/scripts/utils.py | 4 +--
.../0.8/services/HDFS/package/scripts/params.py | 1 +
.../HDFS/package/scripts/service_check.py | 2 +-
13 files changed, 65 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecc916bb/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
index c3d6c39..26e54ec 100644
--- a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
+++ b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
@@ -23,7 +23,6 @@ import ConfigParser
import StringIO
import hostname
import ambari_simplejson as json
-from NetUtil import NetUtil
import os
from ambari_commons import OSConst
@@ -156,7 +155,6 @@ class AmbariConfig:
def __init__(self):
global content
self.config = ConfigParser.RawConfigParser()
-self.net = NetUtil(self)
self.config.readfp(StringIO.StringIO(content))
def get(self, section, value, default=None):
@@ -182,13 +180,22 @@ class AmbariConfig:
def getConfig(self):
return self.config
- @staticmethod
- @OsFamilyFuncImpl(OSConst.WINSRV_FAMILY)
- def getConfigFile(home_dir=""):
-if 'AMBARI_AGENT_CONF_DIR' in os.environ:
- return os.path.join(os.environ['AMBARI_AGENT_CONF_DIR'],
"ambari-agent.ini")
-else:
- return "ambari-agent.ini"
+ @classmethod
+ def get_resolved_config(cls, home_dir=""):
+if hasattr(cls, "_conf_cache"):
+ return getattr(cls, "_conf_cache")
+config = cls()
+configPath = os.path.abspath(cls.getConfigFile(home_dir))
+try:
+ if os.path.exists(configPath):
+config.read(configPath)
+ else:
+raise Exception("No config found at {0}, use
default".format(configPath))
+
+except Exception, err:
+ logger.warn(err)
+setattr(cls, "_conf_cache", config)
+return config
@staticmethod
@OsFamilyFuncImpl(OsFamilyImpl.DEFAULT)
@@ -256,7 +263,8 @@ class AmbariConfig:
self.config.read(filename)
def getServerOption(self, url, name, default=None):
-status, response = self.net.checkURL(url)
+from ambari_agent.NetUtil import NetUtil
+status, response = NetUtil(self).checkURL(url)
if status is True:
try:
data = json.loads(response)
@@ -293,6 +301,9 @@ class AmbariConfig:
logger.info("Updating config property (%s) with value (%s)", k, v)
pass
+ def get_force_https_protocol(self):
+return self.get('security', 'force_https_protocol',
default="PROTOCOL_TLSv1")
+
def isSameHostList(hostlist1, hostlist2):
is_same = True
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecc916bb/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index 5fd3068..02f4212 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -78,6 +78,7 @@ class CustomServiceOrchestrator():
def __init__(self, config, controller):
self.config = config
self.tmp_dir = config.get('agent', 'prefix')
+self.force_https_protocol = config.get_force_https_protocol()
self.exec_tmp_dir = Constants.AGENT_TMP_DIR
self.file_cache = FileCache(config)
self.sta
ambari git commit: AMBARI-19193. Add common log rotation settings to YARN Configs (Madhuvanthi Radhakrishnan via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk 4910de95e -> 30511fad8
AMBARI-19193. Add common log rotation settings to YARN Configs (Madhuvanthi
Radhakrishnan via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/30511fad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/30511fad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/30511fad
Branch: refs/heads/trunk
Commit: 30511fad8a454f57c90b5a0bcde9c6e188495f3b
Parents: 4910de9
Author: Sumit Mohanty
Authored: Wed Dec 14 08:46:30 2016 -0800
Committer: Sumit Mohanty
Committed: Wed Dec 14 08:54:35 2016 -0800
--
.../2.0.6/hooks/before-START/scripts/params.py | 4
.../services/YARN/configuration/yarn-log4j.xml | 25 ++--
2 files changed, 27 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/30511fad/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
index 4a5ee25..daba3d3 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
@@ -208,6 +208,10 @@ yarn_log_dir_prefix =
default("/configurations/yarn-env/yarn_log_dir_prefix","/v
dfs_hosts = default('/configurations/hdfs-site/dfs.hosts', None)
+# Yarn log4j settings
+yarn_rm_summary_log_max_backup_size =
default('configurations/yarn-log4j/yarn_rm_summary_log_max_backup_size', 256)
+yarn_rm_summary_log_number_of_backup_files =
default('configurations/yarn-log4j/yarn_rm_summary_log_number_of_backup_files',
20)
+
#log4j.properties
if (('hdfs-log4j' in config['configurations']) and ('content' in
config['configurations']['hdfs-log4j'])):
log4j_props = config['configurations']['hdfs-log4j']['content']
http://git-wip-us.apache.org/repos/asf/ambari/blob/30511fad/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
index 9ac34f3..84c6db1 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
@@ -21,6 +21,27 @@
-->
+yarn_rm_summary_log_max_backup_size
+256
+The maximum size of backup file before the log is
rotated
+Yarn Log: rmsummary backup file size
+
+MB
+
+
+
+
+ yarn_rm_summary_log_number_of_backup_files
+ 20
+ The number of backup files
+ Yarn Log: # of backup files
+
+int
+0
+
+
+
+
content
yarn-log4j template
Custom log4j.properties
@@ -54,8 +75,8 @@
yarn.server.resourcemanager.appsummary.logger=${hadoop.root.logger}
#- yarn.server.resourcemanager.appsummary.logger (resource manager app
summary log level and appender)
log4j.appender.RMSUMMARY=org.apache.log4j.RollingFileAppender
log4j.appender.RMSUMMARY.File=${yarn.log.dir}/${yarn.server.resourcemanager.appsummary.log.file}
-log4j.appender.RMSUMMARY.MaxFileSize=256MB
-log4j.appender.RMSUMMARY.MaxBackupIndex=20
+log4j.appender.RMSUMMARY.MaxFileSize={{yarn_rm_summary_log_max_backup_size}}MB
+log4j.appender.RMSUMMARY.MaxBackupIndex={{yarn_rm_summary_log_number_of_backup_files}}
log4j.appender.RMSUMMARY.layout=org.apache.log4j.PatternLayout
log4j.appender.RMSUMMARY.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
log4j.appender.JSA.layout=org.apache.log4j.PatternLayout
ambari git commit: AMBARI-19193. Add common log rotation settings to YARN Configs (Madhuvanthi Radhakrishnan via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 fe828aef7 -> e1f7795ba
AMBARI-19193. Add common log rotation settings to YARN Configs (Madhuvanthi
Radhakrishnan via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1f7795b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1f7795b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1f7795b
Branch: refs/heads/branch-2.5
Commit: e1f7795ba1e64945c539b0c5639bbbddb4c123a5
Parents: fe828ae
Author: Sumit Mohanty
Authored: Wed Dec 14 08:46:30 2016 -0800
Committer: Sumit Mohanty
Committed: Wed Dec 14 08:46:36 2016 -0800
--
.../2.0.6/hooks/before-START/scripts/params.py | 4
.../services/YARN/configuration/yarn-log4j.xml | 25 ++--
2 files changed, 27 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f7795b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
index 4a5ee25..daba3d3 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
@@ -208,6 +208,10 @@ yarn_log_dir_prefix =
default("/configurations/yarn-env/yarn_log_dir_prefix","/v
dfs_hosts = default('/configurations/hdfs-site/dfs.hosts', None)
+# Yarn log4j settings
+yarn_rm_summary_log_max_backup_size =
default('configurations/yarn-log4j/yarn_rm_summary_log_max_backup_size', 256)
+yarn_rm_summary_log_number_of_backup_files =
default('configurations/yarn-log4j/yarn_rm_summary_log_number_of_backup_files',
20)
+
#log4j.properties
if (('hdfs-log4j' in config['configurations']) and ('content' in
config['configurations']['hdfs-log4j'])):
log4j_props = config['configurations']['hdfs-log4j']['content']
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1f7795b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
index 9ac34f3..84c6db1 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
@@ -21,6 +21,27 @@
-->
+yarn_rm_summary_log_max_backup_size
+256
+The maximum size of backup file before the log is
rotated
+Yarn Log: rmsummary backup file size
+
+MB
+
+
+
+
+ yarn_rm_summary_log_number_of_backup_files
+ 20
+ The number of backup files
+ Yarn Log: # of backup files
+
+int
+0
+
+
+
+
content
yarn-log4j template
Custom log4j.properties
@@ -54,8 +75,8 @@
yarn.server.resourcemanager.appsummary.logger=${hadoop.root.logger}
#- yarn.server.resourcemanager.appsummary.logger (resource manager app
summary log level and appender)
log4j.appender.RMSUMMARY=org.apache.log4j.RollingFileAppender
log4j.appender.RMSUMMARY.File=${yarn.log.dir}/${yarn.server.resourcemanager.appsummary.log.file}
-log4j.appender.RMSUMMARY.MaxFileSize=256MB
-log4j.appender.RMSUMMARY.MaxBackupIndex=20
+log4j.appender.RMSUMMARY.MaxFileSize={{yarn_rm_summary_log_max_backup_size}}MB
+log4j.appender.RMSUMMARY.MaxBackupIndex={{yarn_rm_summary_log_number_of_backup_files}}
log4j.appender.RMSUMMARY.layout=org.apache.log4j.PatternLayout
log4j.appender.RMSUMMARY.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
log4j.appender.JSA.layout=org.apache.log4j.PatternLayout
ambari git commit: AMBARI-19202. Devdeploy: Database check failed.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk b028fc86a -> 4910de95e
AMBARI-19202. Devdeploy: Database check failed.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4910de95
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4910de95
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4910de95
Branch: refs/heads/trunk
Commit: 4910de95e36e3d15144b8e61f98499d117c6692d
Parents: b028fc8
Author: Vitaly Brodetskyi
Authored: Wed Dec 14 18:17:18 2016 +0200
Committer: Vitaly Brodetskyi
Committed: Wed Dec 14 18:17:18 2016 +0200
--
ambari-common/src/main/python/ambari_commons/os_linux.py | 7 ++-
ambari-server/src/main/python/ambari_server/checkDatabase.py | 5 ++---
2 files changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4910de95/ambari-common/src/main/python/ambari_commons/os_linux.py
--
diff --git a/ambari-common/src/main/python/ambari_commons/os_linux.py
b/ambari-common/src/main/python/ambari_commons/os_linux.py
index 497b1a5..25368c6 100644
--- a/ambari-common/src/main/python/ambari_commons/os_linux.py
+++ b/ambari-common/src/main/python/ambari_commons/os_linux.py
@@ -45,8 +45,13 @@ def os_run_os_command(cmd, env=None, shell=False, cwd=None):
env=env,
cwd=cwd,
shell=shell
- )
+ )
+ process_pid = process.pid
(stdoutdata, stderrdata) = process.communicate()
+ if stdoutdata:
+stdoutdata = stdoutdata + "\nprocess_pid=" + str(process_pid) + "\n"
+ else:
+stdoutdata = "\nprocess_pid=" + str(process_pid) + "\n"
return process.returncode, stdoutdata, stderrdata
def os_change_owner(filePath, user, recursive):
http://git-wip-us.apache.org/repos/asf/ambari/blob/4910de95/ambari-server/src/main/python/ambari_server/checkDatabase.py
--
diff --git a/ambari-server/src/main/python/ambari_server/checkDatabase.py
b/ambari-server/src/main/python/ambari_server/checkDatabase.py
index a6c58e0..2a3e0ba 100644
--- a/ambari-server/src/main/python/ambari_server/checkDatabase.py
+++ b/ambari-server/src/main/python/ambari_server/checkDatabase.py
@@ -80,9 +80,8 @@ def check_database(options):
if retcode > 0:
-print str(stdout)
-raise FatalException(1, 'Database check failed to complete. Please check '
+ configDefaults.SERVER_LOG_FILE +
-' and ' + configDefaults.DB_CHECK_LOG + ' for more
information.')
+raise FatalException(int(retcode), "Database check failed to complete:
{0}. \nPlease check {1} and {2} for more "
+ "information.".format(stdout+stderr,
configDefaults.SERVER_LOG_FILE, configDefaults.DB_CHECK_LOG))
else:
print str(stdout)
if not stdout.startswith("No errors"):
ambari git commit: AMBARI-19202. Devdeploy: Database check failed.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 d29220d8a -> fe828aef7
AMBARI-19202. Devdeploy: Database check failed.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fe828aef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fe828aef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fe828aef
Branch: refs/heads/branch-2.5
Commit: fe828aef7b2cc646fdd9decb431f96d8047b943a
Parents: d29220d
Author: Vitaly Brodetskyi
Authored: Wed Dec 14 18:11:51 2016 +0200
Committer: Vitaly Brodetskyi
Committed: Wed Dec 14 18:11:51 2016 +0200
--
ambari-common/src/main/python/ambari_commons/os_linux.py | 7 ++-
ambari-server/src/main/python/ambari_server/checkDatabase.py | 5 ++---
2 files changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe828aef/ambari-common/src/main/python/ambari_commons/os_linux.py
--
diff --git a/ambari-common/src/main/python/ambari_commons/os_linux.py
b/ambari-common/src/main/python/ambari_commons/os_linux.py
index 497b1a5..25368c6 100644
--- a/ambari-common/src/main/python/ambari_commons/os_linux.py
+++ b/ambari-common/src/main/python/ambari_commons/os_linux.py
@@ -45,8 +45,13 @@ def os_run_os_command(cmd, env=None, shell=False, cwd=None):
env=env,
cwd=cwd,
shell=shell
- )
+ )
+ process_pid = process.pid
(stdoutdata, stderrdata) = process.communicate()
+ if stdoutdata:
+stdoutdata = stdoutdata + "\nprocess_pid=" + str(process_pid) + "\n"
+ else:
+stdoutdata = "\nprocess_pid=" + str(process_pid) + "\n"
return process.returncode, stdoutdata, stderrdata
def os_change_owner(filePath, user, recursive):
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe828aef/ambari-server/src/main/python/ambari_server/checkDatabase.py
--
diff --git a/ambari-server/src/main/python/ambari_server/checkDatabase.py
b/ambari-server/src/main/python/ambari_server/checkDatabase.py
index a6c58e0..2a3e0ba 100644
--- a/ambari-server/src/main/python/ambari_server/checkDatabase.py
+++ b/ambari-server/src/main/python/ambari_server/checkDatabase.py
@@ -80,9 +80,8 @@ def check_database(options):
if retcode > 0:
-print str(stdout)
-raise FatalException(1, 'Database check failed to complete. Please check '
+ configDefaults.SERVER_LOG_FILE +
-' and ' + configDefaults.DB_CHECK_LOG + ' for more
information.')
+raise FatalException(int(retcode), "Database check failed to complete:
{0}. \nPlease check {1} and {2} for more "
+ "information.".format(stdout+stderr,
configDefaults.SERVER_LOG_FILE, configDefaults.DB_CHECK_LOG))
else:
print str(stdout)
if not stdout.startswith("No errors"):
ambari git commit: AMBARI-19200 Turning OFF maintenance mode shows a popup on all hosts. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 2e5d2a9d3 -> d29220d8a
AMBARI-19200 Turning OFF maintenance mode shows a popup on all hosts. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d29220d8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d29220d8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d29220d8
Branch: refs/heads/branch-2.5
Commit: d29220d8a09df7eef509b8cc4f7792d28980943e
Parents: 2e5d2a9
Author: Andrii Tkach
Authored: Wed Dec 14 14:53:51 2016 +0200
Committer: Andrii Tkach
Committed: Wed Dec 14 17:38:57 2016 +0200
--
.../app/controllers/global/cluster_controller.js | 15 +++
.../controllers/global/cluster_controller_test.js| 4 ++--
2 files changed, 9 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d29220d8/ambari-web/app/controllers/global/cluster_controller.js
--
diff --git a/ambari-web/app/controllers/global/cluster_controller.js
b/ambari-web/app/controllers/global/cluster_controller.js
index ea80c41..58fac34 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -306,20 +306,19 @@ App.ClusterController =
Em.Controller.extend(App.ReloadPopupMixin, {
var dbUpgradeState = App.db.get('MainAdminStackAndUpgrade',
'upgradeState');
//completed upgrade shouldn't be restored
- if (lastUpgradeData && lastUpgradeData.Upgrade.request_status ===
"COMPLETED") {
-return;
+ if (lastUpgradeData) {
+if (lastUpgradeData.Upgrade.request_status !== "COMPLETED") {
+ upgradeController.restoreLastUpgrade(lastUpgradeData);
+}
+ } else {
+upgradeController.initDBProperties();
+upgradeController.loadUpgradeData(true);
}
if (!Em.isNone(dbUpgradeState)) {
App.set('upgradeState', dbUpgradeState);
}
- if (lastUpgradeData) {
-upgradeController.restoreLastUpgrade(lastUpgradeData);
- } else {
-upgradeController.initDBProperties();
-upgradeController.loadUpgradeData(true);
- }
upgradeController.loadStackVersionsToModel(true).done(function () {
App.set('stackVersionsAvailable',
App.StackVersion.find().content.length > 0);
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/d29220d8/ambari-web/test/controllers/global/cluster_controller_test.js
--
diff --git a/ambari-web/test/controllers/global/cluster_controller_test.js
b/ambari-web/test/controllers/global/cluster_controller_test.js
index fa95c3e..47708ac 100644
--- a/ambari-web/test/controllers/global/cluster_controller_test.js
+++ b/ambari-web/test/controllers/global/cluster_controller_test.js
@@ -533,8 +533,8 @@ describe('App.clusterController', function () {
expect(upgradeController.restoreLastUpgrade.called).to.be.false;
});
- it('loadStackVersionsToModel should not be called', function () {
-expect(upgradeController.loadStackVersionsToModel.called).to.be.false;
+ it('loadStackVersionsToModel should be called', function () {
+expect(upgradeController.loadStackVersionsToModel).to.be.calledOnce;
});
});
ambari git commit: AMBARI-19200 Turning OFF maintenance mode shows a popup on all hosts. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 6153b0372 -> b028fc86a
AMBARI-19200 Turning OFF maintenance mode shows a popup on all hosts. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b028fc86
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b028fc86
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b028fc86
Branch: refs/heads/trunk
Commit: b028fc86ab8898c9e9621bdd0907826431301e65
Parents: 6153b03
Author: Andrii Tkach
Authored: Wed Dec 14 14:59:04 2016 +0200
Committer: Andrii Tkach
Committed: Wed Dec 14 17:38:20 2016 +0200
--
.../app/controllers/global/cluster_controller.js | 15 +++
.../controllers/global/cluster_controller_test.js| 4 ++--
2 files changed, 9 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b028fc86/ambari-web/app/controllers/global/cluster_controller.js
--
diff --git a/ambari-web/app/controllers/global/cluster_controller.js
b/ambari-web/app/controllers/global/cluster_controller.js
index edb9a26..d7cedd3 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -332,20 +332,19 @@ App.ClusterController =
Em.Controller.extend(App.ReloadPopupMixin, {
}
//completed upgrade shouldn't be restored
- if (lastUpgradeData && lastUpgradeData.Upgrade.request_status ===
"COMPLETED") {
-return;
+ if (lastUpgradeData) {
+if (lastUpgradeData.Upgrade.request_status !== "COMPLETED") {
+ upgradeController.restoreLastUpgrade(lastUpgradeData);
+}
+ } else {
+upgradeController.initDBProperties();
+upgradeController.loadUpgradeData(true);
}
if (!Em.isNone(dbUpgradeState)) {
App.set('upgradeState', dbUpgradeState);
}
- if (lastUpgradeData) {
-upgradeController.restoreLastUpgrade(lastUpgradeData);
- } else {
-upgradeController.initDBProperties();
-upgradeController.loadUpgradeData(true);
- }
upgradeController.loadStackVersionsToModel(true).done(function () {
App.set('stackVersionsAvailable',
App.StackVersion.find().content.length > 0);
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/b028fc86/ambari-web/test/controllers/global/cluster_controller_test.js
--
diff --git a/ambari-web/test/controllers/global/cluster_controller_test.js
b/ambari-web/test/controllers/global/cluster_controller_test.js
index fa95c3e..47708ac 100644
--- a/ambari-web/test/controllers/global/cluster_controller_test.js
+++ b/ambari-web/test/controllers/global/cluster_controller_test.js
@@ -533,8 +533,8 @@ describe('App.clusterController', function () {
expect(upgradeController.restoreLastUpgrade.called).to.be.false;
});
- it('loadStackVersionsToModel should not be called', function () {
-expect(upgradeController.loadStackVersionsToModel.called).to.be.false;
+ it('loadStackVersionsToModel should be called', function () {
+expect(upgradeController.loadStackVersionsToModel).to.be.calledOnce;
});
});
ambari git commit: AMBARI-19196. BG operations modal windows are too small to show the content (in certain scenarios)[Chrome] (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk b0e4c9389 -> 6153b0372
AMBARI-19196. BG operations modal windows are too small to show the content (in
certain scenarios)[Chrome] (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6153b037
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6153b037
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6153b037
Branch: refs/heads/trunk
Commit: 6153b03725d41bbfbd7c801643ec808184817dc7
Parents: b0e4c93
Author: Oleg Nechiporenko
Authored: Wed Dec 14 11:59:35 2016 +0200
Committer: Oleg Nechiporenko
Committed: Wed Dec 14 15:50:37 2016 +0200
--
ambari-web/app/views/common/modal_popup.js | 6 --
.../controllers/main/admin/kerberos/step1_controller_test.js | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6153b037/ambari-web/app/views/common/modal_popup.js
--
diff --git a/ambari-web/app/views/common/modal_popup.js
b/ambari-web/app/views/common/modal_popup.js
index a643b23..47b7d61 100644
--- a/ambari-web/app/views/common/modal_popup.js
+++ b/ambari-web/app/views/common/modal_popup.js
@@ -119,7 +119,7 @@ App.ModalPopup = Ember.View.extend({
enterKeyPressed: function (event) {
var primaryButton = this.$().find('.modal-footer > .btn-success').last();
-if ((!$("*:focus").is("textarea")) && primaryButton.length > 0 &&
primaryButton.attr('disabled') !== 'disabled') {
+if (!$("*:focus").is('textarea') && primaryButton.length > 0 &&
primaryButton.attr('disabled') !== 'disabled') {
event.preventDefault();
event.stopPropagation();
primaryButton.click();
@@ -161,7 +161,9 @@ App.ModalPopup = Ember.View.extend({
'marginTop': 0
});
-block.css('max-height', $(window).height() - top * 2 - (popup.height() -
block.height()));
+var newMaxHeight = $(window).height() - top * 2 - (popup.height() -
block.height());
+newMaxHeight = Math.max(newMaxHeight, 500);
+block.css('max-height', newMaxHeight);
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/6153b037/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js
--
diff --git
a/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js
b/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js
index f3f05a4..3181fda 100644
--- a/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js
@@ -53,7 +53,7 @@ describe('App.KerberosWizardStep1Controller', function() {
expect(controller.get('options')).to.not.be.empty;
controller.loadStep();
var options = controller.get('options');
- expect(options.length == 1).to.be.true;
+ expect(options.length).to.be.equal(1);
});
it("enableIpa is false", function() {
ambari git commit: AMBARI-19197. Kerberos advanced tab. Page wasn't refreshed after save changes. Save button is disabled. (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 22b027efb -> 2e5d2a9d3
AMBARI-19197. Kerberos advanced tab. Page wasn't refreshed after save changes.
Save button is disabled. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2e5d2a9d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2e5d2a9d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2e5d2a9d
Branch: refs/heads/branch-2.5
Commit: 2e5d2a9d3ce1168741bc846c1d20c58484d2b9dd
Parents: 22b027e
Author: Alex Antonenko
Authored: Wed Dec 14 15:54:42 2016 +0200
Committer: Alex Antonenko
Committed: Wed Dec 14 15:54:42 2016 +0200
--
ambari-web/app/templates/main/admin/kerberos.hbs | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2e5d2a9d/ambari-web/app/templates/main/admin/kerberos.hbs
--
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs
b/ambari-web/app/templates/main/admin/kerberos.hbs
index 1e3be1a..4f35fd5 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -41,15 +41,13 @@
{{view App.ServicesConfigView}}
-{{#if isEditMode}}
-
-{{t common.cancel}}
-{{t common.save}}
-
-{{/if}}
+
+ {{t common.cancel}}
+ {{t common.save}}
+
{{else}}
{{t admin.security.disabled}}
ambari git commit: AMBARI-19196. BG operations modal windows are too small to show the content (in certain scenarios)[Chrome] (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 18ed88726 -> 22b027efb
AMBARI-19196. BG operations modal windows are too small to show the content (in
certain scenarios)[Chrome] (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22b027ef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22b027ef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22b027ef
Branch: refs/heads/branch-2.5
Commit: 22b027efb782cb4b33cc0a487262ad8de9cc097e
Parents: 18ed887
Author: Oleg Nechiporenko
Authored: Wed Dec 14 11:59:35 2016 +0200
Committer: Oleg Nechiporenko
Committed: Wed Dec 14 15:49:03 2016 +0200
--
ambari-web/app/views/common/modal_popup.js | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/22b027ef/ambari-web/app/views/common/modal_popup.js
--
diff --git a/ambari-web/app/views/common/modal_popup.js
b/ambari-web/app/views/common/modal_popup.js
index 252604e..a530ed8 100644
--- a/ambari-web/app/views/common/modal_popup.js
+++ b/ambari-web/app/views/common/modal_popup.js
@@ -100,7 +100,7 @@ App.ModalPopup = Ember.View.extend({
enterKeyPressed: function (event) {
var primaryButton = this.$().find('.modal-footer > .btn-success').last();
-if ((!$("*:focus").is("textarea")) && primaryButton.length > 0 &&
primaryButton.attr('disabled') !== 'disabled') {
+if (!$("*:focus").is('textarea') && primaryButton.length > 0 &&
primaryButton.attr('disabled') !== 'disabled') {
event.preventDefault();
event.stopPropagation();
primaryButton.click();
@@ -142,7 +142,9 @@ App.ModalPopup = Ember.View.extend({
'marginTop': 0
});
-block.css('max-height', $(window).height() - top * 2 - (popup.height() -
block.height()));
+var newMaxHeight = $(window).height() - top * 2 - (popup.height() -
block.height());
+newMaxHeight = Math.max(newMaxHeight, 500);
+block.css('max-height', newMaxHeight);
}
});
ambari git commit: AMBARI-19197. Kerberos advanced tab. Page wasn't refreshed after save changes. Save button is disabled. (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk b50546e0c -> b0e4c9389
AMBARI-19197. Kerberos advanced tab. Page wasn't refreshed after save changes.
Save button is disabled. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0e4c938
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0e4c938
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0e4c938
Branch: refs/heads/trunk
Commit: b0e4c938935b3eaee076b419d081439dec6c7812
Parents: b50546e
Author: Alex Antonenko
Authored: Wed Dec 14 15:47:04 2016 +0200
Committer: Alex Antonenko
Committed: Wed Dec 14 15:47:04 2016 +0200
--
ambari-web/app/templates/main/admin/kerberos.hbs | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b0e4c938/ambari-web/app/templates/main/admin/kerberos.hbs
--
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs
b/ambari-web/app/templates/main/admin/kerberos.hbs
index 0e6facf..e7bb618 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -40,15 +40,13 @@
{{view App.ServicesConfigView}}
-{{#if isEditMode}}
-
-{{t common.cancel}}
-{{t common.save}}
-
-{{/if}}
+
+ {{t common.cancel}}
+ {{t common.save}}
+
{{else}}
{{t admin.security.disabled}}
ambari git commit: AMBARI-19199 AMS config types created by upgrade were never marked as selected (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 b76d5f5a1 -> 18ed88726
AMBARI-19199 AMS config types created by upgrade were never marked as selected
(dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/18ed8872
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18ed8872
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18ed8872
Branch: refs/heads/branch-2.5
Commit: 18ed887263cc66cd3c6063425109ad1e2c504e93
Parents: b76d5f5
Author: Dmytro Sen
Authored: Wed Dec 14 15:26:22 2016 +0200
Committer: Dmytro Sen
Committed: Wed Dec 14 15:38:59 2016 +0200
--
.../org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java| 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/18ed8872/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index dbf45c3..1a05b95 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -561,7 +561,6 @@ public abstract class AbstractUpgradeCatalog implements
UpgradeCatalog {
return;
} else if (oldConfig == null) {
oldConfigProperties = new HashMap();
- newTag = "version1";
} else {
oldConfigProperties = oldConfig.getProperties();
}
ambari git commit: AMBARI-19199 AMS config types created by upgrade were never marked as selected (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 1f38a7094 -> b50546e0c
AMBARI-19199 AMS config types created by upgrade were never marked as selected
(dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b50546e0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b50546e0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b50546e0
Branch: refs/heads/trunk
Commit: b50546e0cfa1fdb415d10d0e197c72fd7c9a195f
Parents: 1f38a70
Author: Dmytro Sen
Authored: Wed Dec 14 15:26:22 2016 +0200
Committer: Dmytro Sen
Committed: Wed Dec 14 15:26:22 2016 +0200
--
.../org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java| 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b50546e0/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 380a1e6..90a6ed6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -561,7 +561,6 @@ public abstract class AbstractUpgradeCatalog implements
UpgradeCatalog {
return;
} else if (oldConfig == null) {
oldConfigProperties = new HashMap();
- newTag = "version1";
} else {
oldConfigProperties = oldConfig.getProperties();
}
ambari git commit: AMBARI-19198. Oozie Restart is not prompted on changing MapReduce2 properties.(vbrodetskyi)
Repository: ambari Updated Branches: refs/heads/trunk bc3c23a23 -> 1f38a7094 AMBARI-19198. Oozie Restart is not prompted on changing MapReduce2 properties.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f38a709 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f38a709 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f38a709 Branch: refs/heads/trunk Commit: 1f38a7094da22846576f856233d4d17faa22144c Parents: bc3c23a Author: Vitaly Brodetskyi Authored: Wed Dec 14 13:32:56 2016 +0200 Committer: Vitaly Brodetskyi Committed: Wed Dec 14 13:32:56 2016 +0200 -- .../src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/1f38a709/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml -- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml index 7c7357c..4d46d74 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml @@ -176,6 +176,7 @@ yarn-site hive-site tez-site +mapred-site
ambari git commit: AMBARI-19198. Oozie Restart is not prompted on changing MapReduce2 properties.(vbrodetskyi)
Repository: ambari Updated Branches: refs/heads/branch-2.5 86b9a6cea -> b76d5f5a1 AMBARI-19198. Oozie Restart is not prompted on changing MapReduce2 properties.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b76d5f5a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b76d5f5a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b76d5f5a Branch: refs/heads/branch-2.5 Commit: b76d5f5a14110d78a40b120dcd30a53fc858bf7f Parents: 86b9a6c Author: Vitaly Brodetskyi Authored: Wed Dec 14 13:29:30 2016 +0200 Committer: Vitaly Brodetskyi Committed: Wed Dec 14 13:29:30 2016 +0200 -- .../src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b76d5f5a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml -- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml index 7c7357c..4d46d74 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml @@ -176,6 +176,7 @@ yarn-site hive-site tez-site +mapred-site
[1/2] ambari git commit: AMBARI-19190 Remove UI logic to set or expect hive_server_interactive_host. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 96518477e -> 86b9a6cea
AMBARI-19190 Remove UI logic to set or expect hive_server_interactive_host.
(atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/769611de
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/769611de
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/769611de
Branch: refs/heads/branch-2.5
Commit: 769611debe73b9adeadd61155220c506d519cdf6
Parents: 9651847
Author: Andrii Tkach
Authored: Tue Dec 13 20:42:28 2016 +0200
Committer: Andrii Tkach
Committed: Wed Dec 14 12:52:15 2016 +0200
--
.../app/controllers/main/service/info/configs.js | 15 ---
.../wizard/step7/assign_master_controller.js | 11 ---
ambari-web/app/models/configs/theme/config_action.js | 6 +-
.../wizard/step7/assign_master_controller_test.js| 9 -
4 files changed, 1 insertion(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/769611de/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 130b1b5..e718835 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -607,21 +607,6 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.AddSecurityConfi
serviceConfig.get('configs').push(App.ServiceConfigProperty.create(hProperty));
}
}, this);
-
-App.ConfigAction.find().forEach(function(item){
- var hostComponentConfig = item.get('hostComponentConfig');
- var config = serviceConfig.get('configs').filterProperty('filename',
hostComponentConfig.fileName).findProperty('name',
hostComponentConfig.configName);
- if (config){
-var componentHostName =
App.HostComponent.find().findProperty('componentName',
item.get('componentName')) ;
-if (componentHostName) {
- var setConfigValue = !config.get('value');
- if (setConfigValue) {
-config.set('value', componentHostName.get('hostName'));
-config.set('recommendedValue', componentHostName.get('hostName'));
- }
-}
- }
-}, this);
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/769611de/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
--
diff --git
a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index 399000e..326f571 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -398,19 +398,8 @@ App.AssignMasterOnStep7Controller =
Em.Controller.extend(App.BlueprintMixin, App
self.clearComponentsToBeDeleted(configActionComponent.componentName);
}
- var hostComponentConfig =
context.get('config.configAction.hostComponentConfig');
- var serviceConfigs =
context.get('controller.stepConfigs').findProperty('serviceName',
context.get('config.serviceName')).get('configs');
- var config = serviceConfigs.filterProperty('filename',
hostComponentConfig.fileName).findProperty('name',
hostComponentConfig.configName);
- var oldValue = config.get('value');
- config.set('value', componentHostName);
- config.set('recommendedValue', componentHostName);
configActionComponent.hostName = componentHostName;
self.get('configWidgetContext.config').set('configActionComponent',
configActionComponent);
- context.get('controller').loadConfigRecommendations([{
-"type": App.config.getConfigTagFromFileName(config.get('filename')),
-"name": config.get('name'),
-"old_value": oldValue
- }])
});
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/769611de/ambari-web/app/models/configs/theme/config_action.js
--
diff --git a/ambari-web/app/models/configs/theme/config_action.js
b/ambari-web/app/models/configs/theme/config_action.js
index 70c1e99..9105e1a 100644
--- a/ambari-web/app/models/configs/theme/config_action.js
+++ b/ambari-web/app/models/configs/theme/config_action.js
@@ -59,10 +59,6 @@ App.ConfigAction.FIXTURES = [
file_name: "hive-interactive-env.xml",
if:'${hive-interactive-env/enable_hive_interactive}',
then:'add',
-else: 'delete',
-host_component_config: {
- configName: "hive_server_interactive_host",
- fileName: "hive-interactive-env.xm
[2/2] ambari git commit: AMBARI-19184 Remove HSI host name from UI. (smohanty via atkach)
AMBARI-19184 Remove HSI host name from UI. (smohanty via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/86b9a6ce
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86b9a6ce
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86b9a6ce
Branch: refs/heads/branch-2.5
Commit: 86b9a6ceaab9f2f2ee72c4708e3dca256d58ab75
Parents: 769611d
Author: Andrii Tkach
Authored: Wed Dec 14 12:51:04 2016 +0200
Committer: Andrii Tkach
Committed: Wed Dec 14 12:56:13 2016 +0200
--
.../HIVE/configuration/hive-interactive-env.xml | 10 --
.../HDP/2.5/services/HIVE/themes/theme.json | 30 +
.../stacks/HDP/2.5/services/stack_advisor.py| 16 ++---
.../stacks/2.5/common/test_stack_advisor.py | 34 +++-
.../test/python/stacks/2.5/configs/hsi_ha.json | 1 -
5 files changed, 8 insertions(+), 83 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/86b9a6ce/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
index 7b20728..a1f6d22 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
@@ -43,16 +43,6 @@
-hive_server_interactive_host
-localhost
-The host that has been assigned to run HiveServer2
Interactive
-HiveServer2 Interactive Host
-
- false
-
-
-
-
num_llap_nodes
1
The number of Hive LLAP daemons to run.
http://git-wip-us.apache.org/repos/asf/ambari/blob/86b9a6ce/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json
index 1d50b6a..9caf51e 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json
+++
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json
@@ -19,28 +19,6 @@
"subsection-name": "interactive-query-row1-col1"
},
{
- "config": "hive-interactive-env/hive_server_interactive_host",
- "subsection-name": "interactive-query-row1-col1",
- "depends-on": [
-{
- "configs":[
-"hive-interactive-env/enable_hive_interactive"
- ],
- "if": "${hive-interactive-env/enable_hive_interactive}",
- "then": {
-"property_value_attributes": {
- "visible": true
-}
- },
- "else": {
-"property_value_attributes": {
- "visible": false
-}
- }
-}
- ]
-},
-{
"config": "hive-interactive-site/hive.llap.daemon.queue.name",
"subsection-name": "interactive-query-row1-col1",
"depends-on": [
@@ -206,12 +184,6 @@
}
},
{
-"config": "hive-interactive-env/hive_server_interactive_host",
-"widget": {
- "type": "label"
-}
- },
- {
"config": "hive-interactive-site/hive.llap.daemon.queue.name",
"widget": {
"type": "combo"
@@ -274,4 +246,4 @@
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/86b9a6ce/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 60c1cac..50f7b7f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -387,17 +387,6 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
validationItems.append({"config-name": "enable_hive_interactive",
"item": self.getErrorItem(
"HIVE_SERVER_INTERACTIVE requires
enable_hive_interactive in hive-interactive-env set to true.")})
- if 'hive_server_interactive_host' in hive_site_env_properties:
-
[2/2] ambari git commit: AMBARI-19184 Remove HSI host name from UI. (smohanty via atkach)
AMBARI-19184 Remove HSI host name from UI. (smohanty via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc3c23a2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc3c23a2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc3c23a2
Branch: refs/heads/trunk
Commit: bc3c23a23aadd59971c6e14fe6cdf5990ac71a45
Parents: c366922
Author: Andrii Tkach
Authored: Wed Dec 14 12:51:04 2016 +0200
Committer: Andrii Tkach
Committed: Wed Dec 14 12:51:04 2016 +0200
--
.../HIVE/configuration/hive-interactive-env.xml | 10 --
.../HDP/2.5/services/HIVE/themes/theme.json | 30 +
.../stacks/HDP/2.5/services/stack_advisor.py| 16 ++---
.../stacks/2.5/common/test_stack_advisor.py | 34 +++-
.../test/python/stacks/2.5/configs/hsi_ha.json | 1 -
5 files changed, 8 insertions(+), 83 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc3c23a2/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
index 7b20728..a1f6d22 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml
@@ -43,16 +43,6 @@
-hive_server_interactive_host
-localhost
-The host that has been assigned to run HiveServer2
Interactive
-HiveServer2 Interactive Host
-
- false
-
-
-
-
num_llap_nodes
1
The number of Hive LLAP daemons to run.
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc3c23a2/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json
index 1d50b6a..9caf51e 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json
+++
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/themes/theme.json
@@ -19,28 +19,6 @@
"subsection-name": "interactive-query-row1-col1"
},
{
- "config": "hive-interactive-env/hive_server_interactive_host",
- "subsection-name": "interactive-query-row1-col1",
- "depends-on": [
-{
- "configs":[
-"hive-interactive-env/enable_hive_interactive"
- ],
- "if": "${hive-interactive-env/enable_hive_interactive}",
- "then": {
-"property_value_attributes": {
- "visible": true
-}
- },
- "else": {
-"property_value_attributes": {
- "visible": false
-}
- }
-}
- ]
-},
-{
"config": "hive-interactive-site/hive.llap.daemon.queue.name",
"subsection-name": "interactive-query-row1-col1",
"depends-on": [
@@ -206,12 +184,6 @@
}
},
{
-"config": "hive-interactive-env/hive_server_interactive_host",
-"widget": {
- "type": "label"
-}
- },
- {
"config": "hive-interactive-site/hive.llap.daemon.queue.name",
"widget": {
"type": "combo"
@@ -274,4 +246,4 @@
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc3c23a2/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 60c1cac..50f7b7f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -387,17 +387,6 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
validationItems.append({"config-name": "enable_hive_interactive",
"item": self.getErrorItem(
"HIVE_SERVER_INTERACTIVE requires
enable_hive_interactive in hive-interactive-env set to true.")})
- if 'hive_server_interactive_host' in hive_site_env_properties:
-hs
[1/2] ambari git commit: AMBARI-19190 Remove UI logic to set or expect hive_server_interactive_host. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk a7a53896a -> bc3c23a23
AMBARI-19190 Remove UI logic to set or expect hive_server_interactive_host.
(atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c3669229
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c3669229
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c3669229
Branch: refs/heads/trunk
Commit: c3669229ff0f6da6e8a96e239607a0782a5d2c75
Parents: a7a5389
Author: Andrii Tkach
Authored: Tue Dec 13 20:20:50 2016 +0200
Committer: Andrii Tkach
Committed: Wed Dec 14 12:24:46 2016 +0200
--
.../app/controllers/main/service/info/configs.js | 15 ---
.../wizard/step7/assign_master_controller.js | 11 ---
ambari-web/app/models/configs/theme/config_action.js | 6 +-
.../wizard/step7/assign_master_controller_test.js| 14 +-
4 files changed, 2 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c3669229/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 94caf4a..b5538e0 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -607,21 +607,6 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.AddSecurityConfi
serviceConfig.get('configs').push(App.ServiceConfigProperty.create(hProperty));
}
}, this);
-
-App.ConfigAction.find().forEach(function(item){
- var hostComponentConfig = item.get('hostComponentConfig');
- var config = serviceConfig.get('configs').filterProperty('filename',
hostComponentConfig.fileName).findProperty('name',
hostComponentConfig.configName);
- if (config){
-var componentHostName =
App.HostComponent.find().findProperty('componentName',
item.get('componentName')) ;
-if (componentHostName) {
- var setConfigValue = !config.get('value');
- if (setConfigValue) {
-config.set('value', componentHostName.get('hostName'));
-config.set('recommendedValue', componentHostName.get('hostName'));
- }
-}
- }
-}, this);
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/c3669229/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
--
diff --git
a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index 1ee0c45..81c80e1 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -399,19 +399,8 @@ App.AssignMasterOnStep7Controller =
Em.Controller.extend(App.BlueprintMixin, App
self.clearComponentsToBeDeleted(configActionComponent.componentName);
}
- var hostComponentConfig =
context.get('config.configAction.hostComponentConfig');
- var serviceConfigs =
context.get('controller.stepConfigs').findProperty('serviceName',
context.get('config.serviceName')).get('configs');
- var config = serviceConfigs.filterProperty('filename',
hostComponentConfig.fileName).findProperty('name',
hostComponentConfig.configName);
- var oldValue = config.get('value');
- config.set('value', componentHostName);
- config.set('recommendedValue', componentHostName);
configActionComponent.hostName = componentHostName;
self.get('configWidgetContext.config').set('configActionComponent',
configActionComponent);
- context.get('controller').loadConfigRecommendations([{
-"type": App.config.getConfigTagFromFileName(config.get('filename')),
-"name": config.get('name'),
-"old_value": oldValue
- }])
});
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/c3669229/ambari-web/app/models/configs/theme/config_action.js
--
diff --git a/ambari-web/app/models/configs/theme/config_action.js
b/ambari-web/app/models/configs/theme/config_action.js
index 9ac4e7a..905fecb 100644
--- a/ambari-web/app/models/configs/theme/config_action.js
+++ b/ambari-web/app/models/configs/theme/config_action.js
@@ -63,11 +63,7 @@ App.ConfigAction.FIXTURES = [
file_name: "hive-interactive-env.xml",
if:'${hive-interactive-env/enable_hive_interactive}',
then:'add',
-else: 'delete',
-host_component_config: {
- configName: "hive_server_interactive_host",
- fileName: "hive-interactive-env.xml"
-
ambari git commit: AMBARI-18945 Allowing user to edit service name while enabling ranger plugin (mugdha)
Repository: ambari
Updated Branches:
refs/heads/trunk 2fee4286b -> a7a53896a
AMBARI-18945 Allowing user to edit service name while enabling ranger plugin
(mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a7a53896
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a7a53896
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a7a53896
Branch: refs/heads/trunk
Commit: a7a53896ac50ccd035288cc0d94f0e879448d083
Parents: 2fee428
Author: Mugdha Varadkar
Authored: Tue Dec 13 07:23:32 2016 +0530
Committer: Mugdha Varadkar
Committed: Wed Dec 14 14:28:51 2016 +0530
--
.../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py | 3 +++
.../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 3 +++
.../HDFS/2.1.0.2.0/package/scripts/params_linux.py| 3 +++
.../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 3 +++
.../common-services/KAFKA/0.8.1/package/scripts/params.py | 3 +++
.../KNOX/0.5.0.2.2/package/scripts/params_linux.py| 3 +++
.../RANGER_KMS/0.5.0.2.3/package/scripts/params.py| 3 +++
.../common-services/STORM/0.9.1/package/scripts/params_linux.py | 3 +++
.../YARN/2.1.0.2.0/package/scripts/params_linux.py| 3 +++
9 files changed, 27 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a7a53896/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index 1a73634..a295915 100644
---
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -315,6 +315,9 @@ if has_ranger_admin and stack_supports_atlas_ranger_plugin:
)
repo_name = str(config['clusterName']) + '_atlas'
+ repo_name_value =
config['configurations']['ranger-atlas-security']['ranger.plugin.atlas.service.name']
+ if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}":
+repo_name = repo_name_value
ssl_keystore_password =
unicode(config['configurations']['ranger-atlas-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password'])
ssl_truststore_password =
unicode(config['configurations']['ranger-atlas-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password'])
credential_file = format('/etc/ranger/{repo_name}/cred.jceks')
http://git-wip-us.apache.org/repos/asf/ambari/blob/a7a53896/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index f47dc8f..8200a85 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -266,6 +266,9 @@ xa_audit_db_name =
default('/configurations/admin-properties/audit_db_name', 'ra
xa_audit_db_user = default('/configurations/admin-properties/audit_db_user',
'rangerlogger')
xa_db_host = config['configurations']['admin-properties']['db_host']
repo_name = str(config['clusterName']) + '_hbase'
+repo_name_value =
config['configurations']['ranger-hbase-security']['ranger.plugin.hbase.service.name']
+if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}":
+ repo_name = repo_name_value
common_name_for_certificate =
config['configurations']['ranger-hbase-plugin-properties']['common.name.for.certificate']
http://git-wip-us.apache.org/repos/asf/ambari/blob/a7a53896/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index 69e6863..7567ab4 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -406,6 +406,9 @@ xa_audit_db_name =
default('/configurations/admin-properties/audit_db_name', 'ra
xa_audit_
ambari git commit: AMBARI-18945 Allowing user to edit service name while enabling ranger plugin (mugdha)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 fb86ef739 -> 96518477e
AMBARI-18945 Allowing user to edit service name while enabling ranger plugin
(mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/96518477
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/96518477
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/96518477
Branch: refs/heads/branch-2.5
Commit: 96518477edb76d0ea1f804db0239087aaa0fb584
Parents: fb86ef7
Author: Mugdha Varadkar
Authored: Tue Dec 13 07:23:32 2016 +0530
Committer: Mugdha Varadkar
Committed: Wed Dec 14 14:26:53 2016 +0530
--
.../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py | 3 +++
.../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 3 +++
.../HDFS/2.1.0.2.0/package/scripts/params_linux.py| 3 +++
.../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 3 +++
.../common-services/KAFKA/0.8.1/package/scripts/params.py | 3 +++
.../KNOX/0.5.0.2.2/package/scripts/params_linux.py| 3 +++
.../RANGER_KMS/0.5.0.2.3/package/scripts/params.py| 3 +++
.../common-services/STORM/0.9.1/package/scripts/params_linux.py | 3 +++
.../YARN/2.1.0.2.0/package/scripts/params_linux.py| 3 +++
9 files changed, 27 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index 32e1510..3d33a49 100644
---
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -313,6 +313,9 @@ if has_ranger_admin and stack_supports_atlas_ranger_plugin:
)
repo_name = str(config['clusterName']) + '_atlas'
+ repo_name_value =
config['configurations']['ranger-atlas-security']['ranger.plugin.atlas.service.name']
+ if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}":
+repo_name = repo_name_value
ssl_keystore_password =
unicode(config['configurations']['ranger-atlas-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password'])
ssl_truststore_password =
unicode(config['configurations']['ranger-atlas-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password'])
credential_file = format('/etc/ranger/{repo_name}/cred.jceks')
http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index f47dc8f..8200a85 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -266,6 +266,9 @@ xa_audit_db_name =
default('/configurations/admin-properties/audit_db_name', 'ra
xa_audit_db_user = default('/configurations/admin-properties/audit_db_user',
'rangerlogger')
xa_db_host = config['configurations']['admin-properties']['db_host']
repo_name = str(config['clusterName']) + '_hbase'
+repo_name_value =
config['configurations']['ranger-hbase-security']['ranger.plugin.hbase.service.name']
+if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}":
+ repo_name = repo_name_value
common_name_for_certificate =
config['configurations']['ranger-hbase-plugin-properties']['common.name.for.certificate']
http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index d86e360..0aac45e 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -407,6 +407,9 @@ xa_audit_db_name =
default('/configurations/admin-properties/audit_db_name', 'ra
