ambari git commit: AMBARI-10111. Tune GC settings for HBase daemon. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk f7109d2ff -> 8599d19d9
AMBARI-10111. Tune GC settings for HBase daemon. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8599d19d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8599d19d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8599d19d
Branch: refs/heads/trunk
Commit: 8599d19d93a774fa248d97400b7b6270c1d677fd
Parents: f7109d2
Author: Siddharth Wagle
Authored: Tue Mar 17 18:32:21 2015 -0700
Committer: Siddharth Wagle
Committed: Tue Mar 17 18:32:21 2015 -0700
--
.../0.1.0/configuration/ams-hbase-env.xml | 38 +++---
.../0.1.0/package/scripts/hbase.py | 11 -
.../0.1.0/package/scripts/params.py | 34 ++---
.../stacks/HDP/2.0.6/services/stack_advisor.py | 52 ++--
.../stacks/2.2/common/test_stack_advisor.py | 7 +--
5 files changed, 109 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8599d19d/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 88692a4..f0b549e 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
@@ -34,22 +34,44 @@
hbase_regionserver_heapsize
1024m
-HBase RegionServer Heap Size.
+
+HBase RegionServer Heap Size. In embedded mode, total heap size is
+sum of master and regionserver heap sizes.
+
-hbase_regionserver_xmn_max
-512m
-HBase RegionServer maximum value for minimum heap
size.
+regionserver_xmn_size
+256m
+HBase RegionServer maximum value for young generation heap
size.
+
+
+hbase_master_xmn_size
+256m
+
+ HBase Master maximum value for young generation heap size.
+
+
+
+hbase_master_maxperm_size
+128m
+HBase RegionServer maximum value for perm heap
size.
hbase_regionserver_xmn_ratio
0.2
-HBase RegionServer minimum heap size is calculated as a
percentage of max heap size.
+
+HBase RegionServer minimum heap size is calculated as a percentage
+of max heap size. If hbase_regionserver_xmn_max is defined, the ratio
+will be used to calculate -Xmn setting.
+
hbase_master_heapsize
1024m
-HBase Master Heap Size
+
+HBase Master Heap Size. In embedded mode, total heap size is
+sum of master and regionserver heap sizes.
+
@@ -85,8 +107,8 @@ export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails
-XX:+PrintGCDateStamps -X
# More details at:
http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html
#
# export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false
-Dcom.sun.management.jmxremote.authenticate=false"
-export HBASE_MASTER_OPTS="-Xmx{{master_heapsize}}"
-export HBASE_REGIONSERVER_OPTS="-Xmn{{regionserver_xmn_size}}
-XX:CMSInitiatingOccupancyFraction=70 -Xms{{regionserver_heapsize}}
-Xmx{{regionserver_heapsize}}"
+export HBASE_MASTER_OPTS=" -XX:PermSize=64m
-XX:MaxPermSize={{hbase_master_maxperm_size}} -Xms{{hbase_heapsize}}
-Xmx{{hbase_heapsize}} -Xmn{{hbase_master_xmn_size}}
-XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly"
+export HBASE_REGIONSERVER_OPTS="-XX:MaxPermSize=128m
-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70
-XX:+UseCMSInitiatingOccupancyOnly -Xms{{regionserver_heapsize}}
-Xmx{{regionserver_heapsize}}"
# export HBASE_THRIFT_OPTS="$HBASE_JMX_BASE
-Dcom.sun.management.jmxremote.port=10103"
# export HBASE_ZOOKEEPER_OPTS="$HBASE_JMX_BASE
-Dcom.sun.management.jmxremote.port=10104"
http://git-wip-us.apache.org/repos/asf/ambari/blob/8599d19d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
--
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
index 8c8f85a..cd9f8f9 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
@@ -59,17 +59,6
ambari git commit: AMBARI-10111. Tune GC settings for HBase daemon. (swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 412285a9c -> e6c725980
AMBARI-10111. Tune GC settings for HBase daemon. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6c72598
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6c72598
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6c72598
Branch: refs/heads/branch-2.0.0
Commit: e6c7259801b3d34b254f954fd2d8d364662f72d0
Parents: 412285a
Author: Siddharth Wagle
Authored: Tue Mar 17 18:31:27 2015 -0700
Committer: Siddharth Wagle
Committed: Tue Mar 17 18:31:35 2015 -0700
--
.../0.1.0/configuration/ams-hbase-env.xml | 27 +---
.../0.1.0/package/scripts/params.py | 14 +++---
.../stacks/HDP/2.0.6/services/stack_advisor.py | 4 +++
.../stacks/2.2/common/test_stack_advisor.py | 1 +
4 files changed, 38 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6c72598/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 88692a4..35f2a50 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
@@ -44,13 +44,32 @@
hbase_regionserver_xmn_ratio
0.2
-HBase RegionServer minimum heap size is calculated as a
percentage of max heap size.
+
+ HBase RegionServer minimum heap size is calculated as a percentage of
+ max heap size. If hbase_regionserver_xmn_max is defined, the ratio
+ will be used to calculate -Xmn setting.
+
hbase_master_heapsize
1024m
HBase Master Heap Size
+
+regionserver_xmn_size
+256m
+HBase RegionServer maximum value for young generation heap
size.
+
+
+hbase_master_xmn_size
+256m
+HBase Master maximum value for young generation heap
size.
+
+
+hbase_master_maxperm_size
+128m
+HBase RegionServer maximum value for perm heap
size.
+
@@ -68,7 +87,7 @@ export HBASE_CONF_DIR=${HBASE_CONF_DIR:-{{hbase_conf_dir}}}
# Extra Java CLASSPATH elements. Optional.
export HBASE_CLASSPATH=${HBASE_CLASSPATH}
-# The maximum amount of heap to use, in MB. Default is 1000.
+# The maximum amount of heap to use, in MB. Default is 1000. Master heap size.
export HBASE_HEAPSIZE={{hbase_heapsize}}
# Extra Java runtime options.
@@ -85,8 +104,8 @@ export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails
-XX:+PrintGCDateStamps -X
# More details at:
http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html
#
# export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false
-Dcom.sun.management.jmxremote.authenticate=false"
-export HBASE_MASTER_OPTS="-Xmx{{master_heapsize}}"
-export HBASE_REGIONSERVER_OPTS="-Xmn{{regionserver_xmn_size}}
-XX:CMSInitiatingOccupancyFraction=70 -Xms{{regionserver_heapsize}}
-Xmx{{regionserver_heapsize}}"
+export HBASE_MASTER_OPTS=" -XX:PermSize=64m
-XX:MaxPermSize={{hbase_master_maxperm_size}} -Xms{{hbase_heapsize}}
-Xmx{{hbase_heapsize}} -Xmn{{hbase_master_xmn_size}}
-XX:CMSInitiatingOccupancyFraction=70 -XX:+UseCMSInitiatingOccupancyOnly"
+export HBASE_REGIONSERVER_OPTS="-XX:MaxPermSize=128m
-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70
-XX:+UseCMSInitiatingOccupancyOnly -Xms{{regionserver_heapsize}}
-Xmx{{regionserver_heapsize}}"
# export HBASE_THRIFT_OPTS="$HBASE_JMX_BASE
-Dcom.sun.management.jmxremote.port=10103"
# export HBASE_ZOOKEEPER_OPTS="$HBASE_JMX_BASE
-Dcom.sun.management.jmxremote.port=10104"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6c72598/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index ab8b56a..2732965 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -77,13 +77,19 @@ metrics_collector_heapsize =
default('/configurations/ams-env/metrics_collector_
hbase_log_dir = config['configurations']['ams-hbase-env']['hbase_l
ambari git commit: AMBARI-10112. Build all ambari-views/examples properly. (yusaku)
Repository: ambari Updated Branches: refs/heads/branch-2.0.0 75d1bb0f9 -> 412285a9c AMBARI-10112. Build all ambari-views/examples properly. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/412285a9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/412285a9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/412285a9 Branch: refs/heads/branch-2.0.0 Commit: 412285a9c6d8659f7ffea477cd63002e01f40702 Parents: 75d1bb0 Author: Yusaku Sako Authored: Tue Mar 17 15:39:44 2015 -0700 Committer: Yusaku Sako Committed: Tue Mar 17 17:46:49 2015 -0700 -- ambari-views/examples/pom.xml | 3 +++ ambari-views/examples/property-validator-view/pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/412285a9/ambari-views/examples/pom.xml -- diff --git a/ambari-views/examples/pom.xml b/ambari-views/examples/pom.xml index 4e93c35..fedb6c2 100644 --- a/ambari-views/examples/pom.xml +++ b/ambari-views/examples/pom.xml @@ -30,6 +30,9 @@ calculator-view weather-view restricted-view +simple-view +property-view +property-validator-view http://git-wip-us.apache.org/repos/asf/ambari/blob/412285a9/ambari-views/examples/property-validator-view/pom.xml -- diff --git a/ambari-views/examples/property-validator-view/pom.xml b/ambari-views/examples/property-validator-view/pom.xml index 57e2df3..1883166 100644 --- a/ambari-views/examples/property-validator-view/pom.xml +++ b/ambari-views/examples/property-validator-view/pom.xml @@ -31,7 +31,7 @@ org.apache.ambari ambari-views - [1.7.0.0,) + 2.0.0-SNAPSHOT com.sun.jersey
ambari git commit: AMBARI-10113. Change the layout for the service summary page.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 709ad140e -> f7109d2ff
AMBARI-10113. Change the layout for the service summary page.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f7109d2f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f7109d2f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f7109d2f
Branch: refs/heads/trunk
Commit: f7109d2ffb37acf823cc192bcf81acc7930b0f9c
Parents: 709ad14
Author: Xi Wang
Authored: Tue Mar 17 17:12:15 2015 -0700
Committer: Xi Wang
Committed: Tue Mar 17 17:44:38 2015 -0700
--
ambari-web/app/styles/application.less | 6 +--
.../app/styles/enhanced_service_dashboard.less | 32 ++
.../app/templates/main/service/info/summary.hbs | 44 +++-
.../templates/main/service/services/hbase.hbs | 9
.../templates/main/service/services/hdfs.hbs| 9
.../templates/main/service/services/storm.hbs | 9
.../templates/main/service/services/yarn.hbs| 9
.../app/views/main/service/info/summary.js | 13 --
8 files changed, 106 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f7109d2f/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 6ec3347..b617a6a 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1871,7 +1871,7 @@ a:focus {
}
}
-.services, #summary-info {
+.services, .summary-info {
.tab-marker-position {
background-position: 0px 3px;
background-repeat: no-repeat;
@@ -1916,7 +1916,7 @@ a:focus {
}
}
-#summary-info {
+.summary-info {
border-top: none;
border-collapse: collapse;
color: #666;
@@ -2318,7 +2318,7 @@ a:focus {
}
.service-content {
- #summary-info {
+ .summary-info {
margin-bottom: 0;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f7109d2f/ambari-web/app/styles/enhanced_service_dashboard.less
--
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less
b/ambari-web/app/styles/enhanced_service_dashboard.less
new file mode 100644
index 000..8555f44
--- /dev/null
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -0,0 +1,32 @@
+/**
+ * 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.
+ */
+
+.service-metrics-block {
+
+ #add-widget-action-box {
+margin: 20px 10px 10px 10px;
+padding: 40px 55px;
+border: 1px solid #ddd;
+.icon-plus {
+ font-size: 70px;
+ color: #ddd;
+ position: center;
+}
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f7109d2f/ambari-web/app/templates/main/service/info/summary.hbs
--
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs
b/ambari-web/app/templates/main/service/info/summary.hbs
index ec27c32..7156731 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -44,24 +44,24 @@
{{/isAccessible}}
{{/if}}
-
-
-
-
-{{controller.content.label}} {{t
services.service.info.menu.summary}}
-{{#if view.hasAlertDefinitions}}
- {{#if view.alertsCount}}
-
- {{view.alertsCount}} {{pluralize view.alertsCount
singular="alert" plural="alerts"}}
- {{else}}
-{{t
services.service.summary.alerts.noAlerts}}
- {{/if}}
+
+
+
+ {{controller.content.label}} {{t
services.service.info.menu.summary}}
+ {{#if view.hasAlertDefinitions}}
+{{#if view.alertsCount}}
+
+{{view.alertsCount}} {{pluralize view.alertsCount singular="alert"
plural="alerts"}}
+{{else}}
+ {{t
services.service.summary.alerts.noAlerts}}
{{/if}}
-
-
-
+
ambari git commit: AMBARI-10112. Build all ambari-views/examples properly. (yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk f751bfa6a -> 709ad140e
AMBARI-10112. Build all ambari-views/examples properly. (yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/709ad140
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/709ad140
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/709ad140
Branch: refs/heads/trunk
Commit: 709ad140e2b9870dff41b0d49e8c76c2fc5111ac
Parents: f751bfa
Author: Yusaku Sako
Authored: Tue Mar 17 17:06:39 2015 -0700
Committer: Yusaku Sako
Committed: Tue Mar 17 17:06:39 2015 -0700
--
ambari-views/examples/pom.xml | 3 +++
ambari-views/examples/property-validator-view/pom.xml | 4 ++--
ambari-views/examples/property-view/pom.xml | 4 ++--
ambari-views/examples/simple-view/pom.xml | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/709ad140/ambari-views/examples/pom.xml
--
diff --git a/ambari-views/examples/pom.xml b/ambari-views/examples/pom.xml
index 4751093..5bc4fb5 100644
--- a/ambari-views/examples/pom.xml
+++ b/ambari-views/examples/pom.xml
@@ -36,6 +36,9 @@
calculator-view
weather-view
restricted-view
+simple-view
+property-view
+property-validator-view
${project.parent.parent.basedir}
http://git-wip-us.apache.org/repos/asf/ambari/blob/709ad140/ambari-views/examples/property-validator-view/pom.xml
--
diff --git a/ambari-views/examples/property-validator-view/pom.xml
b/ambari-views/examples/property-validator-view/pom.xml
index 87f08cc..cb529d7 100644
--- a/ambari-views/examples/property-validator-view/pom.xml
+++ b/ambari-views/examples/property-validator-view/pom.xml
@@ -23,7 +23,7 @@
4.0.0
property-validator-view
- 0.1.0
+ 2.0.0-SNAPSHOT
jar
Ambari Property Validator View
http://maven.apache.org
@@ -34,7 +34,7 @@
org.apache.ambari
ambari-views
- [1.7.0.0,)
+ 2.0.0-SNAPSHOT
com.sun.jersey
http://git-wip-us.apache.org/repos/asf/ambari/blob/709ad140/ambari-views/examples/property-view/pom.xml
--
diff --git a/ambari-views/examples/property-view/pom.xml
b/ambari-views/examples/property-view/pom.xml
index 3194227..b50cb69 100644
--- a/ambari-views/examples/property-view/pom.xml
+++ b/ambari-views/examples/property-view/pom.xml
@@ -19,11 +19,11 @@
org.apache.ambari
ambari-view-examples
-1.0.0
+2.0.0-SNAPSHOT
4.0.0
property-view
- 0.1.0
+ 2.0.0-SNAPSHOT
jar
Ambari Property View
http://maven.apache.org
http://git-wip-us.apache.org/repos/asf/ambari/blob/709ad140/ambari-views/examples/simple-view/pom.xml
--
diff --git a/ambari-views/examples/simple-view/pom.xml
b/ambari-views/examples/simple-view/pom.xml
index 83df882..b1d221e 100644
--- a/ambari-views/examples/simple-view/pom.xml
+++ b/ambari-views/examples/simple-view/pom.xml
@@ -19,11 +19,11 @@
org.apache.ambari
ambari-view-examples
-1.0.0
+2.0.0-SNAPSHOT
4.0.0
simple-view
- 0.1.0
+ 2.0.0-SNAPSHOT
jar
Ambari Simple View
http://maven.apache.org
ambari git commit: AMBARI-10098. RU - Unable to begin RU due to MySQL 'Error preallocating sequence numbers' (alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 df25c750e -> 75d1bb0f9
AMBARI-10098. RU - Unable to begin RU due to MySQL 'Error preallocating
sequence numbers' (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/75d1bb0f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75d1bb0f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75d1bb0f
Branch: refs/heads/branch-2.0.0
Commit: 75d1bb0f959513ffcf33c60d78b644af85bcb3ec
Parents: df25c75
Author: Alejandro Fernandez
Authored: Tue Mar 17 15:58:13 2015 -0700
Committer: Alejandro Fernandez
Committed: Tue Mar 17 15:58:13 2015 -0700
--
ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 +
ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql | 1 +
2 files changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/75d1bb0f/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index 3da9bb9..9ff62df 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -797,6 +797,7 @@ INSERT INTO ambari_sequences(sequence_name, sequence_value)
values ('alert_notic
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('alert_current_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('repo_version_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_id_seq', 0);
+INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_group_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_item_id_seq', 0);
insert into adminresourcetype (resource_type_id, resource_type_name)
http://git-wip-us.apache.org/repos/asf/ambari/blob/75d1bb0f/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index b404b4d..7d62aee 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -789,6 +789,7 @@ INSERT INTO ambari_sequences(sequence_name, sequence_value)
values ('alert_notic
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('alert_current_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('repo_version_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_id_seq', 0);
+INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_group_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_item_id_seq', 0);
INSERT INTO metainfo("metainfo_key", "metainfo_value") values ('version',
'${ambariVersion}');
ambari git commit: AMBARI-10110. Tooltip on Dashboard is not disappearing (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 78a1eb580 -> f751bfa6a
AMBARI-10110. Tooltip on Dashboard is not disappearing (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f751bfa6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f751bfa6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f751bfa6
Branch: refs/heads/trunk
Commit: f751bfa6aed3aeb98792ac435b737a901ad240ed
Parents: 78a1eb5
Author: Alex Antonenko
Authored: Tue Mar 17 19:53:10 2015 +0200
Committer: Alex Antonenko
Committed: Tue Mar 17 23:47:20 2015 +0200
--
ambari-web/app/views/main/dashboard/widget.js | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f751bfa6/ambari-web/app/views/main/dashboard/widget.js
--
diff --git a/ambari-web/app/views/main/dashboard/widget.js
b/ambari-web/app/views/main/dashboard/widget.js
index be027c2..558d477 100644
--- a/ambari-web/app/views/main/dashboard/widget.js
+++ b/ambari-web/app/views/main/dashboard/widget.js
@@ -175,6 +175,9 @@ App.DashboardWidgetView = Em.View.extend({
App.tooltip(this.$("[rel='ZoomInTooltip']"), {placement : 'left'});
},
+ willDestroyElement : function() {
+$('.tooltip').remove();
+ },
/**
* delete widget
* @param {object} event
ambari git commit: AMBARI-10101. Hive alert on secured cluster (rlevas)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 a89acabfc -> df25c750e
AMBARI-10101. Hive alert on secured cluster (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df25c750
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df25c750
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df25c750
Branch: refs/heads/branch-2.0.0
Commit: df25c750e00d694be500ec5976477e356b9d94f3
Parents: a89acab
Author: Robert Levas
Authored: Tue Mar 17 14:52:17 2015 -0400
Committer: Robert Levas
Committed: Tue Mar 17 16:54:14 2015 -0400
--
.../0.12.0.2.0/package/alerts/alert_hive_metastore.py | 10 --
.../0.12.0.2.0/package/alerts/alert_hive_thrift_port.py | 10 --
2 files changed, 16 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/df25c750/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
index 804ddfe..f302896 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
@@ -30,6 +30,7 @@ CRITICAL_MESSAGE = "Metastore on {0} failed ({1})"
SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}'
SMOKEUSER_KEYTAB_KEY = '{{cluster-env/smokeuser_keytab}}'
+SMOKEUSER_PRINCIPAL_KEY = '{{cluster-env/smokeuser_principal_name}}'
SMOKEUSER_KEY = '{{cluster-env/smokeuser}}'
HIVE_METASTORE_URIS_KEY = '{{hive-site/hive.metastore.uris}}'
@@ -37,6 +38,7 @@ PERCENT_WARNING = 200
PERCENT_CRITICAL = 200
SMOKEUSER_KEYTAB_DEFAULT = '/etc/security/keytabs/smokeuser.headless.keytab'
+SMOKEUSER_PRINCIPAL_DEFAULT = 'ambari...@example.com'
SMOKEUSER_DEFAULT = 'ambari-qa'
def get_tokens():
@@ -44,7 +46,7 @@ def get_tokens():
Returns a tuple of tokens in the format {{site/property}} that will be used
to build the dictionary passed into execute
"""
- return
(SECURITY_ENABLED_KEY,SMOKEUSER_KEYTAB_KEY,SMOKEUSER_KEY,HIVE_METASTORE_URIS_KEY)
+ return
(SECURITY_ENABLED_KEY,SMOKEUSER_KEYTAB_KEY,SMOKEUSER_PRINCIPAL_KEY,HIVE_METASTORE_URIS_KEY)
def execute(parameters=None, host_name=None):
@@ -67,6 +69,10 @@ def execute(parameters=None, host_name=None):
if SECURITY_ENABLED_KEY in parameters:
security_enabled = str(parameters[SECURITY_ENABLED_KEY]).upper() == 'TRUE'
+ smokeuser_principal = SMOKEUSER_PRINCIPAL_DEFAULT
+ if SMOKEUSER_PRINCIPAL_KEY in parameters:
+smokeuser_principal = parameters[SMOKEUSER_PRINCIPAL_KEY]
+
smokeuser = SMOKEUSER_DEFAULT
if SMOKEUSER_KEY in parameters:
smokeuser = parameters[SMOKEUSER_KEY]
@@ -81,7 +87,7 @@ def execute(parameters=None, host_name=None):
smokeuser_keytab = parameters[SMOKEUSER_KEYTAB_KEY]
kinit_path_local = get_kinit_path()
- kinitcmd=format("{kinit_path_local} -kt {smokeuser_keytab} {smokeuser};
")
+ kinitcmd=format("{kinit_path_local} -kt {smokeuser_keytab}
{smokeuser_principal}; ")
Execute(kinitcmd, user=smokeuser,
path=["/bin/", "/usr/bin/", "/usr/lib/hive/bin/", "/usr/sbin/"],
http://git-wip-us.apache.org/repos/asf/ambari/blob/df25c750/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
index 0fb8898..cb60e81 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
@@ -34,6 +34,7 @@ SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}'
HIVE_SERVER2_AUTHENTICATION_KEY = '{{hive-site/hive.server2.authentication}}'
HIVE_SERVER_PRINCIPAL_KEY =
'{{hive-site/hive.server2.authentication.kerberos.principal}}'
SMOKEUSER_KEYTAB_KEY = '{{cluster-env/smokeuser_keytab}}'
+SMOKEUSER_PRINCIPAL_KEY = '{{cluster-env/smokeuser_principal_name}}'
SMOKEUSER_KEY = '{{cluster-env/smokeuser}}'
PERCENT_WARNING = 200
@@ -44,6 +45,7 @@ HIVE_SERVER_TRANSPORT_MODE_DEFAULT = 'binary'
HIVE_SERVER_PRINCIPAL_DEFAULT = 'hive/_h...@example.com'
HIVE_SERVER2_AUTHENTICATION_DEFAULT = 'NOSASL'
ambari git commit: AMBARI-10101. Hive alert on secured cluster (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk a67fc09e2 -> 78a1eb580
AMBARI-10101. Hive alert on secured cluster (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/78a1eb58
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/78a1eb58
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/78a1eb58
Branch: refs/heads/trunk
Commit: 78a1eb58056706d6eeceeb0a5fd4d80cfad95cb7
Parents: a67fc09
Author: Robert Levas
Authored: Tue Mar 17 14:47:54 2015 -0400
Committer: Robert Levas
Committed: Tue Mar 17 16:51:50 2015 -0400
--
.../0.12.0.2.0/package/alerts/alert_hive_metastore.py | 10 --
.../0.12.0.2.0/package/alerts/alert_hive_thrift_port.py | 10 --
2 files changed, 16 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/78a1eb58/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
index 804ddfe..f302896 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
@@ -30,6 +30,7 @@ CRITICAL_MESSAGE = "Metastore on {0} failed ({1})"
SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}'
SMOKEUSER_KEYTAB_KEY = '{{cluster-env/smokeuser_keytab}}'
+SMOKEUSER_PRINCIPAL_KEY = '{{cluster-env/smokeuser_principal_name}}'
SMOKEUSER_KEY = '{{cluster-env/smokeuser}}'
HIVE_METASTORE_URIS_KEY = '{{hive-site/hive.metastore.uris}}'
@@ -37,6 +38,7 @@ PERCENT_WARNING = 200
PERCENT_CRITICAL = 200
SMOKEUSER_KEYTAB_DEFAULT = '/etc/security/keytabs/smokeuser.headless.keytab'
+SMOKEUSER_PRINCIPAL_DEFAULT = 'ambari...@example.com'
SMOKEUSER_DEFAULT = 'ambari-qa'
def get_tokens():
@@ -44,7 +46,7 @@ def get_tokens():
Returns a tuple of tokens in the format {{site/property}} that will be used
to build the dictionary passed into execute
"""
- return
(SECURITY_ENABLED_KEY,SMOKEUSER_KEYTAB_KEY,SMOKEUSER_KEY,HIVE_METASTORE_URIS_KEY)
+ return
(SECURITY_ENABLED_KEY,SMOKEUSER_KEYTAB_KEY,SMOKEUSER_PRINCIPAL_KEY,HIVE_METASTORE_URIS_KEY)
def execute(parameters=None, host_name=None):
@@ -67,6 +69,10 @@ def execute(parameters=None, host_name=None):
if SECURITY_ENABLED_KEY in parameters:
security_enabled = str(parameters[SECURITY_ENABLED_KEY]).upper() == 'TRUE'
+ smokeuser_principal = SMOKEUSER_PRINCIPAL_DEFAULT
+ if SMOKEUSER_PRINCIPAL_KEY in parameters:
+smokeuser_principal = parameters[SMOKEUSER_PRINCIPAL_KEY]
+
smokeuser = SMOKEUSER_DEFAULT
if SMOKEUSER_KEY in parameters:
smokeuser = parameters[SMOKEUSER_KEY]
@@ -81,7 +87,7 @@ def execute(parameters=None, host_name=None):
smokeuser_keytab = parameters[SMOKEUSER_KEYTAB_KEY]
kinit_path_local = get_kinit_path()
- kinitcmd=format("{kinit_path_local} -kt {smokeuser_keytab} {smokeuser};
")
+ kinitcmd=format("{kinit_path_local} -kt {smokeuser_keytab}
{smokeuser_principal}; ")
Execute(kinitcmd, user=smokeuser,
path=["/bin/", "/usr/bin/", "/usr/lib/hive/bin/", "/usr/sbin/"],
http://git-wip-us.apache.org/repos/asf/ambari/blob/78a1eb58/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
index 0fb8898..cb60e81 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_thrift_port.py
@@ -34,6 +34,7 @@ SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}'
HIVE_SERVER2_AUTHENTICATION_KEY = '{{hive-site/hive.server2.authentication}}'
HIVE_SERVER_PRINCIPAL_KEY =
'{{hive-site/hive.server2.authentication.kerberos.principal}}'
SMOKEUSER_KEYTAB_KEY = '{{cluster-env/smokeuser_keytab}}'
+SMOKEUSER_PRINCIPAL_KEY = '{{cluster-env/smokeuser_principal_name}}'
SMOKEUSER_KEY = '{{cluster-env/smokeuser}}'
PERCENT_WARNING = 200
@@ -44,6 +45,7 @@ HIVE_SERVER_TRANSPORT_MODE_DEFAULT = 'binary'
HIVE_SERVER_PRINCIPAL_DEFAULT = 'hive/_h...@example.com'
HIVE_SERVER2_AUTHENTICATION_DEFAULT = 'NOSASL'
SMOKEUSER_KEYT
ambari git commit: AMBARI-10107 RU: include info about completed / total in RU progress popup. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk ed021fa82 -> a67fc09e2
AMBARI-10107 RU: include info about completed / total in RU progress popup.
(atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a67fc09e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a67fc09e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a67fc09e
Branch: refs/heads/trunk
Commit: a67fc09e2559cae9c01738fc8ec44ec70c717937
Parents: ed021fa
Author: Andrii Tkach
Authored: Tue Mar 17 17:34:15 2015 +0200
Committer: Andrii Tkach
Committed: Tue Mar 17 20:19:38 2015 +0200
--
ambari-web/app/assets/data/stack_versions/upgrade.json| 2 ++
.../main/admin/stack_and_upgrade_controller.js| 1 +
ambari-web/app/styles/application.less| 9 +
.../templates/main/admin/stack_upgrade/upgrade_group.hbs | 4 +++-
.../views/main/admin/stack_upgrade/upgrade_group_view.js | 10 ++
.../main/admin/stack_and_upgrade_controller_test.js | 4 +++-
6 files changed, 28 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/app/assets/data/stack_versions/upgrade.json
--
diff --git a/ambari-web/app/assets/data/stack_versions/upgrade.json
b/ambari-web/app/assets/data/stack_versions/upgrade.json
index 657fbb0..2b6188b 100644
--- a/ambari-web/app/assets/data/stack_versions/upgrade.json
+++ b/ambari-web/app/assets/data/stack_versions/upgrade.json
@@ -623,6 +623,8 @@
"progress_percent" : 0.0,
"request_id" : 23,
"status" : "IN_PROGRESS",
+"completed_task_count" : 2,
+"total_task_count" : 3,
"title" : "Core Slaves"
},
"upgrade_items" : [
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index a40e69e..b8c5768 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -221,6 +221,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
oldData.upgradeGroups.forEach(function (oldGroup) {
oldGroup.set('status', groupsMap[oldGroup.get('group_id')].status);
oldGroup.set('progress_percent',
groupsMap[oldGroup.get('group_id')].progress_percent);
+oldGroup.set('completed_task_count',
groupsMap[oldGroup.get('group_id')].completed_task_count);
oldGroup.upgradeItems.forEach(function (item) {
item.set('status', itemsMap[item.get('stage_id')].status);
item.set('progress_percent',
itemsMap[item.get('stage_id')].progress_percent);
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index ac974fb..6ec3347 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5537,4 +5537,13 @@ input[type="checkbox"].align-checkbox {
.bottom-border {
border-bottom: 1px solid #dd;
+}
+
+.progress-counter {
+ position: relative;
+ .counters-label {
+font-weight: bold;
+left: 45%;
+position: absolute;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
--
diff --git
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
index 41807a4..c4d0f51 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
@@ -24,9 +24,11 @@
{{#if view.content.isRunning}}
- {{view App.ProgressBarView
+ {{view view.progressBarView
progressBinding="view.content.progress"
statusBinding="view.content.status"
+totalTasksBinding="view.content.total_task_count"
+completedTasksBinding="view.content.completed_task_count"
}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/app/views/main/admin/stack_upgrade/upgrade_group_view.js
--
diff --git
a/ambari-web/ap
ambari git commit: AMBARI-10098. RU - Unable to begin RU due to MySQL 'Error preallocating sequence numbers' (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 9d5ff60d7 -> ed021fa82
AMBARI-10098. RU - Unable to begin RU due to MySQL 'Error preallocating
sequence numbers' (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed021fa8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed021fa8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed021fa8
Branch: refs/heads/trunk
Commit: ed021fa82f8168c35f9a87d715e9ec88429c3e93
Parents: 9d5ff60
Author: Alejandro Fernandez
Authored: Mon Mar 16 18:27:01 2015 -0700
Committer: Alejandro Fernandez
Committed: Tue Mar 17 10:58:25 2015 -0700
--
ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 +
ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql | 1 +
2 files changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed021fa8/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index 3da9bb9..9ff62df 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -797,6 +797,7 @@ INSERT INTO ambari_sequences(sequence_name, sequence_value)
values ('alert_notic
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('alert_current_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('repo_version_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_id_seq', 0);
+INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_group_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_item_id_seq', 0);
insert into adminresourcetype (resource_type_id, resource_type_name)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ed021fa8/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index b404b4d..7d62aee 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -789,6 +789,7 @@ INSERT INTO ambari_sequences(sequence_name, sequence_value)
values ('alert_notic
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('alert_current_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('repo_version_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_id_seq', 0);
+INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_group_id_seq', 0);
INSERT INTO ambari_sequences(sequence_name, sequence_value) values
('upgrade_item_id_seq', 0);
INSERT INTO metainfo("metainfo_key", "metainfo_value") values ('version',
'${ambariVersion}');
ambari git commit: AMBARI-10108. Provide ability to configure rack awareness. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk a0dab0ce8 -> 9d5ff60d7
AMBARI-10108. Provide ability to configure rack awareness. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9d5ff60d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9d5ff60d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9d5ff60d
Branch: refs/heads/trunk
Commit: 9d5ff60d7d640f14ad0dd33e1d6e48514ab39e6e
Parents: a0dab0c
Author: Aleksandr Kovalenko
Authored: Tue Mar 17 18:23:18 2015 +0200
Committer: Aleksandr Kovalenko
Committed: Tue Mar 17 19:34:36 2015 +0200
--
ambari-web/app/config.js| 3 +-
.../app/controllers/global/update_controller.js | 2 +-
.../app/controllers/main/charts/heatmap.js | 104 +--
ambari-web/app/controllers/main/host.js | 21 +++-
ambari-web/app/controllers/main/host/details.js | 15 +++
ambari-web/app/messages.js | 7 ++
ambari-web/app/routes/main.js | 5 +-
ambari-web/app/styles/application.less | 6 ++
.../main/charts/heatmap/heatmap_host_detail.hbs | 5 +-
ambari-web/app/templates/main/host.hbs | 11 +-
.../app/templates/main/host/rack_id_popup.hbs | 25 +
ambari-web/app/templates/main/host/summary.hbs | 5 +
ambari-web/app/utils/ajax/ajax.js | 24 -
ambari-web/app/utils/hosts.js | 55 +-
ambari-web/app/utils/validator.js | 5 +
.../main/charts/heatmap/heatmap_host_detail.js | 3 +-
.../views/main/charts/heatmap/heatmap_rack.js | 37 ++-
ambari-web/app/views/main/host.js | 22 +++-
ambari-web/app/views/main/host/details.js | 6 +-
.../views/main/host/hosts_table_menu_view.js| 16 ++-
20 files changed, 325 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d5ff60d/ambari-web/app/config.js
--
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 140e7c3..6e06e59 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -73,7 +73,8 @@ App.supports = {
installGanglia: false,
opsDuringRollingUpgrade: false,
customizedWidgets: false,
- enhancedConfigs: false
+ enhancedConfigs: false,
+ setRackId: false
};
if (App.enableExperimental) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d5ff60d/ambari-web/app/controllers/global/update_controller.js
--
diff --git a/ambari-web/app/controllers/global/update_controller.js
b/ambari-web/app/controllers/global/update_controller.js
index d89e687..a2fc895 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -168,7 +168,7 @@ App.UpdateController = Em.Controller.extend({
var testUrl = '/data/hosts/HDP2/hosts.json',
self = this,
hostDetailsFilter = '';
-var realUrl =
'/hosts?fields=Hosts/host_name,Hosts/maintenance_state,Hosts/public_host_name,Hosts/cpu_count,Hosts/ph_cpu_count,'
+
+var realUrl =
'/hosts?fields=Hosts/rack_info,Hosts/host_name,Hosts/maintenance_state,Hosts/public_host_name,Hosts/cpu_count,Hosts/ph_cpu_count,'
+
'alerts_summary,Hosts/host_status,Hosts/last_heartbeat_time,Hosts/ip,host_components/HostRoles/state,host_components/HostRoles/maintenance_state,'
+
'host_components/HostRoles/stale_configs,host_components/HostRoles/service_name,host_components/HostRoles/desired_admin_state,'
+
'metrics/disk,metrics/load/load_one,Hosts/total_mem&minimal_response=true';
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d5ff60d/ambari-web/app/controllers/main/charts/heatmap.js
--
diff --git a/ambari-web/app/controllers/main/charts/heatmap.js
b/ambari-web/app/controllers/main/charts/heatmap.js
index cf5319e..ecc57b3 100644
--- a/ambari-web/app/controllers/main/charts/heatmap.js
+++ b/ambari-web/app/controllers/main/charts/heatmap.js
@@ -19,18 +19,89 @@ var App = require('app');
App.MainChartsHeatmapController = Em.Controller.extend({
name: 'mainChartsHeatmapController',
- modelRacks: App.Rack.find(),
+ rackMap: [],
+ modelRacks: [],
+ rackViews: [],
+
racks: function () {
-var racks = [];
-this.get('modelRacks').forEach(function (rack) {
- racks.push(Em.Object.create({
-name: rack.get('name'),
-hosts: rack.get('hosts'),
-isLoaded: false
- }));
+return this.get('modelRacks');
+ }.property('modelRacks.@each.isLoaded'),
+
+ /**
+ * get hosts from server
+ */
+ loadRacks: function () {
+this.get('modelRacks'
ambari git commit: AMBARI-10104 Enhanced Configs: create models and mappers for tab sections and subsections (additional). (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk c34b47410 -> a0dab0ce8
AMBARI-10104 Enhanced Configs: create models and mappers for tab sections and
subsections (additional). (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a0dab0ce
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a0dab0ce
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a0dab0ce
Branch: refs/heads/trunk
Commit: a0dab0ce868f55f668c2a2ed9ce575fb5af3cd46
Parents: c34b474
Author: aBabiichuk
Authored: Tue Mar 17 19:18:48 2015 +0200
Committer: aBabiichuk
Committed: Tue Mar 17 19:20:23 2015 +0200
--
ambari-web/app/config.js | 3 ++-
ambari-web/app/controllers/installer.js| 6 ++
ambari-web/app/controllers/main/service/add_controller.js | 6 ++
ambari-web/app/controllers/main/service/info/configs.js| 3 +++
ambari-web/app/views/common/configs/service_config_view.js | 9 +++--
5 files changed, 24 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0dab0ce/ambari-web/app/config.js
--
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 6a5f564..140e7c3 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -72,7 +72,8 @@ App.supports = {
customizeAgentUserAccount: false,
installGanglia: false,
opsDuringRollingUpgrade: false,
- customizedWidgets: false
+ customizedWidgets: false,
+ enhancedConfigs: false
};
if (App.enableExperimental) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0dab0ce/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js
b/ambari-web/app/controllers/installer.js
index d723134..26f6ac4 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -658,6 +658,12 @@ App.InstallerController = App.WizardController.extend({
{
type: 'sync',
callback: function () {
+ if (App.get('supports.enhancedConfigs')) {
+var serviceNames = App.StackService.find().filter(function(s) {
+ return s.get('isSelected');
+}).mapProperty('serviceName');
+App.themesMapper.generateAdvancedTabs(serviceNames);
+ }
this.loadServiceConfigGroups();
this.loadServiceConfigProperties();
this.loadCurrentHostGroups();
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0dab0ce/ambari-web/app/controllers/main/service/add_controller.js
--
diff --git a/ambari-web/app/controllers/main/service/add_controller.js
b/ambari-web/app/controllers/main/service/add_controller.js
index 97c6031..87c1700 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -115,6 +115,12 @@ App.AddServiceController =
App.WizardController.extend(App.AddSecurityConfigs, {
var self = this;
var dfd = $.Deferred();
this.loadKerberosDescriptorConfigs().done(function() {
+if (App.get('supports.enhancedConfigs')) {
+ var serviceNames = App.StackService.find().filter(function(s) {
+return s.get('isSelected') || s.get('isInstalled');
+ }).mapProperty('serviceName');
+ App.themesMapper.generateAdvancedTabs(serviceNames);
+}
self.loadServiceConfigGroups();
self.loadServiceConfigProperties();
dfd.resolve();
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0dab0ce/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 9f27d94..126c20c 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -257,6 +257,9 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
*/
loadStep: function () {
console.log("TRACE: Loading configure for service");
+if (App.get('supports.enhancedConfigs')) {
+ App.themesMapper.generateAdvancedTabs([this.get('content.serviceName')]);
+}
this.clearStep();
this.loadClusterEnvSite();
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0dab0ce/ambari-web/app/views/common/configs/service_config_view.js
--
diff --git a/ambari-web/a
ambari git commit: AMBARI-10109. Improve logging of RMF (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 1db1692ee -> c34b47410
AMBARI-10109. Improve logging of RMF (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c34b4741
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c34b4741
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c34b4741
Branch: refs/heads/trunk
Commit: c34b474108be07ea5db8fd56b04af96fb3dc06d1
Parents: 1db1692
Author: Andrew Onishuk
Authored: Tue Mar 17 18:41:05 2015 +0200
Committer: Andrew Onishuk
Committed: Tue Mar 17 18:41:05 2015 +0200
--
.../resource_management/TestDirectoryResource.py| 6 +++---
.../TestExecuteHadoopResource.py| 2 +-
.../python/resource_management/TestFileResource.py | 4 ++--
.../python/resource_management/TestLinkResource.py | 4 ++--
.../TestMonitorWebserverResource.py | 16
.../test/python/resource_management/TestScript.py | 4 ++--
.../main/python/resource_management/core/base.py| 2 +-
.../main/python/resource_management/core/shell.py | 8 +++-
.../libraries/functions/version_select_util.py | 2 +-
9 files changed, 27 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c34b4741/ambari-agent/src/test/python/resource_management/TestDirectoryResource.py
--
diff --git
a/ambari-agent/src/test/python/resource_management/TestDirectoryResource.py
b/ambari-agent/src/test/python/resource_management/TestDirectoryResource.py
index f42de93..7667a2d 100644
--- a/ambari-agent/src/test/python/resource_management/TestDirectoryResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestDirectoryResource.py
@@ -111,7 +111,7 @@ class TestDirectoryResource(TestCase):
)
self.fail("Must fail because parent directory /a/b/c doesn't exist")
except Fail as e:
- self.assertEqual('Applying u"Directory[\'/a/b/c/d\']" failed, parent
directory /a/b/c doesn\'t exist',
+ self.assertEqual('Applying Directory[\'/a/b/c/d\'] failed, parent
directory /a/b/c doesn\'t exist',
str(e))
@patch.object(sudo, "path_exists")
@@ -130,7 +130,7 @@ class TestDirectoryResource(TestCase):
)
self.fail("Must fail because file /a/b/c/d already exists")
except Fail as e:
- self.assertEqual('Applying u"Directory[\'/a/b/c/d\']" failed, file
/a/b/c/d already exists',
+ self.assertEqual('Applying Directory[\'/a/b/c/d\'] failed, file /a/b/c/d
already exists',
str(e))
@patch.object(sudo, "rmtree")
@@ -170,5 +170,5 @@ class TestDirectoryResource(TestCase):
)
self.fail("Must fail because /a/b/c/d is not a directory")
except Fail as e:
- self.assertEqual('Applying u"Directory[\'/a/b/c/d\']" failed, /a/b/c/d
is not a directory',
+ self.assertEqual('Applying Directory[\'/a/b/c/d\'] failed, /a/b/c/d is
not a directory',
str(e))
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/c34b4741/ambari-agent/src/test/python/resource_management/TestExecuteHadoopResource.py
--
diff --git
a/ambari-agent/src/test/python/resource_management/TestExecuteHadoopResource.py
b/ambari-agent/src/test/python/resource_management/TestExecuteHadoopResource.py
index a368e5d..6bb9d0f 100644
---
a/ambari-agent/src/test/python/resource_management/TestExecuteHadoopResource.py
+++
b/ambari-agent/src/test/python/resource_management/TestExecuteHadoopResource.py
@@ -176,7 +176,7 @@ class TestExecuteHadoopResource(TestCase):
)
self.assertEqual(execute_mock.call_count, 2)
self.assertEqual(str(execute_mock.call_args_list[0][0][0]),
- 'u"Execute[\'path -kt keytab principal\']"')
+ 'Execute[\'path -kt keytab principal\']')
self.assertEqual(execute_mock.call_args_list[0][0][0].command,
'path -kt keytab principal')
self.assertEqual(execute_mock.call_args_list[0][0][0].arguments,
http://git-wip-us.apache.org/repos/asf/ambari/blob/c34b4741/ambari-agent/src/test/python/resource_management/TestFileResource.py
--
diff --git
a/ambari-agent/src/test/python/resource_management/TestFileResource.py
b/ambari-agent/src/test/python/resource_management/TestFileResource.py
index f60fc12..703651c 100644
--- a/ambari-agent/src/test/python/resource_management/TestFileResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestFileResource.py
@@ -48,7 +48,7 @@ class TestFileResource(TestCase):
self.fail("Must fail when directo
ambari git commit: AMBARI-10106. With Yarn Rm HA enabled no mark for Active Resource Manager is displayed (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 b16c3f17f -> a89acabfc
AMBARI-10106. With Yarn Rm HA enabled no mark for Active Resource Manager is
displayed (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a89acabf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a89acabf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a89acabf
Branch: refs/heads/branch-2.0.0
Commit: a89acabfc91e89ca9f3df34873ecfff82759
Parents: b16c3f1
Author: Alex Antonenko
Authored: Tue Mar 17 17:40:07 2015 +0200
Committer: Alex Antonenko
Committed: Tue Mar 17 17:41:32 2015 +0200
--
ambari-web/app/mappers/service_metrics_mapper.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a89acabf/ambari-web/app/mappers/service_metrics_mapper.js
--
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js
b/ambari-web/app/mappers/service_metrics_mapper.js
index 3303369..e594968 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -181,9 +181,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
host_component.id = host_component.HostRoles.component_name + "_" +
host_component.HostRoles.host_name;
previousComponentStatuses[host_component.id] =
host_component.HostRoles.state;
previousComponentPassiveStates[host_component.id] =
host_component.HostRoles.maintenance_state;
- if (host_component.HostRoles.component_name == "HBASE_MASTER") {
-this.config3.ha_status = 'metrics.hbase.master.IsActiveMaster';
- }
+ this.config3.ha_status = host_component.HostRoles.component_name ==
"HBASE_MASTER" ?
+'metrics.hbase.master.IsActiveMaster' : 'HostRoles.ha_state';
var comp = this.parseIt(host_component, this.config3);
comp.service_id = serviceName;
hostComponents.push(comp);
ambari git commit: AMBARI-10106. With Yarn Rm HA enabled no mark for Active Resource Manager is displayed (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 434ce972e -> 1db1692ee
AMBARI-10106. With Yarn Rm HA enabled no mark for Active Resource Manager is
displayed (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1db1692e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1db1692e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1db1692e
Branch: refs/heads/trunk
Commit: 1db1692eec500c5d93332b8f0a3e3b6b752641bc
Parents: 434ce97
Author: Alex Antonenko
Authored: Tue Mar 17 17:40:07 2015 +0200
Committer: Alex Antonenko
Committed: Tue Mar 17 17:40:19 2015 +0200
--
ambari-web/app/mappers/service_metrics_mapper.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1db1692e/ambari-web/app/mappers/service_metrics_mapper.js
--
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js
b/ambari-web/app/mappers/service_metrics_mapper.js
index ade8cd7..a2189bb 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -181,9 +181,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
host_component.id = host_component.HostRoles.component_name + "_" +
host_component.HostRoles.host_name;
previousComponentStatuses[host_component.id] =
host_component.HostRoles.state;
previousComponentPassiveStates[host_component.id] =
host_component.HostRoles.maintenance_state;
- if (host_component.HostRoles.component_name == "HBASE_MASTER") {
-this.config3.ha_status = 'metrics.hbase.master.IsActiveMaster';
- }
+ this.config3.ha_status = host_component.HostRoles.component_name ==
"HBASE_MASTER" ?
+'metrics.hbase.master.IsActiveMaster' : 'HostRoles.ha_state';
var comp = this.parseIt(host_component, this.config3);
comp.service_id = serviceName;
hostComponents.push(comp);
ambari git commit: AMBARI-9908 add quicklinks and host config substitution for accumulo (billie)
Repository: ambari
Updated Branches:
refs/heads/trunk 72bd502b0 -> 434ce972e
AMBARI-9908 add quicklinks and host config substitution for accumulo (billie)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/434ce972
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/434ce972
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/434ce972
Branch: refs/heads/trunk
Commit: 434ce972e7e609a8b2922e2836615119680c29f5
Parents: 72bd502
Author: Billie Rinaldi
Authored: Mon Mar 16 19:07:57 2015 -0700
Committer: Billie Rinaldi
Committed: Tue Mar 17 08:20:57 2015 -0700
--
ambari-web/app/controllers/main/host/details.js | 3 +++
.../main/service/reassign/step4_controller.js| 3 +++
ambari-web/app/mappers/service_metrics_mapper.js | 3 ++-
ambari-web/app/models/quick_links.js | 11 +++
ambari-web/app/models/service_config.js | 5 +
ambari-web/app/views/common/quick_view_link_view.js | 3 +++
.../main/service/reassign/step4_controller_test.js | 8 ++--
7 files changed, 33 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/434ce972/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js
b/ambari-web/app/controllers/main/host/details.js
index cb5c5b2..e526b71 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -949,6 +949,9 @@ App.MainHostDetailsController = Em.Controller.extend({
if (configs['hbase-site']) {
configs['hbase-site']['hbase.zookeeper.quorum'] = zks.join(',');
}
+if (configs['accumulo-site']) {
+ configs['accumulo-site']['instance.zookeeper.host'] = zksWithPort;
+}
if (configs['webhcat-site']) {
configs['webhcat-site']['templeton.zookeeper.hosts'] = zksWithPort;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/434ce972/ambari-web/app/controllers/main/service/reassign/step4_controller.js
--
diff --git
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index 4a37f88..a8ea7ef 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -661,6 +661,9 @@ App.ReassignMasterWizardStep4Controller =
App.HighAvailabilityProgressPageContro
if (!App.get('isHaEnabled') && App.Service.find('HBASE').get('isLoaded')) {
configs['hbase-site']['hbase.rootdir'] =
configs['hbase-site']['hbase.rootdir'].replace(/\/\/[^\/]*/, '//' +
targetHostName + ':8020');
}
+if (!App.get('isHaEnabled') &&
App.Service.find('ACCUMULO').get('isLoaded')) {
+ configs['accumulo-site']['instance.volumes'] =
configs['accumulo-site']['instance.volumes'].replace(/\/\/[^\/]*/, '//' +
targetHostName + ':8020');
+}
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/434ce972/ambari-web/app/mappers/service_metrics_mapper.js
--
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js
b/ambari-web/app/mappers/service_metrics_mapper.js
index 3303369..ade8cd7 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -359,7 +359,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
STORM: [31],
FALCON: [32],
RANGER: [33],
- SPARK: [34]
+ SPARK: [34],
+ ACCUMULO: [35]
};
if (quickLinks[item.ServiceInfo.service_name])
finalJson.quick_links = quickLinks[item.ServiceInfo.service_name];
http://git-wip-us.apache.org/repos/asf/ambari/blob/434ce972/ambari-web/app/models/quick_links.js
--
diff --git a/ambari-web/app/models/quick_links.js
b/ambari-web/app/models/quick_links.js
index 57f912a..0961eb0 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -311,5 +311,16 @@ App.QuickLinks.FIXTURES = [
site: 'spark-defaults',
regex: '^(\\d+)$',
default_http_port: 18080
+ },
+ {
+id:35,
+label:'Accumulo Monitor UI',
+url:'%@://%@:%@/',
+service_id: 'ACCUMULO',
+template:'%@://%@:%@/',
+http_config: 'monitor.port.client',
+site: 'accumulo-site',
+regex: '^(\\d+)$',
+default_http_port: 50095
}
];
http://git-wip-us.apache.org/repos/asf/ambari/blob/434ce972/ambari-web/app/models/service_config.js
---
ambari git commit: AMBARI-10102 Create ember data model for widget. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk ea1d531be -> 72bd502b0
AMBARI-10102 Create ember data model for widget. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/72bd502b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/72bd502b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/72bd502b
Branch: refs/heads/trunk
Commit: 72bd502b051a5343bf5ff3987ecbccec22f47ff4
Parents: ea1d531
Author: Andrii Tkach
Authored: Tue Mar 17 17:13:50 2015 +0200
Committer: Andrii Tkach
Committed: Tue Mar 17 17:13:50 2015 +0200
--
.../assets/data/widgets/service_widgets.json| 46
ambari-web/app/config.js| 3 +-
ambari-web/app/controllers/main/service/item.js | 23 +++-
ambari-web/app/mappers.js | 1 +
ambari-web/app/mappers/widget_mapper.js | 56
ambari-web/app/models.js| 3 +-
ambari-web/app/models/widget.js | 36 +
ambari-web/app/views/main/service/item.js | 3 ++
.../test/controllers/main/service/item_test.js | 14 +
9 files changed, 182 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/72bd502b/ambari-web/app/assets/data/widgets/service_widgets.json
--
diff --git a/ambari-web/app/assets/data/widgets/service_widgets.json
b/ambari-web/app/assets/data/widgets/service_widgets.json
new file mode 100644
index 000..6e511d6
--- /dev/null
+++ b/ambari-web/app/assets/data/widgets/service_widgets.json
@@ -0,0 +1,46 @@
+{
+ "href":
"http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.2/services/HDFS/artifacts/widget_layout";,
+ "Artifacts": {
+"artifact_name": "widget_order",
+"service_name": "HDFS",
+"stack_name": "HDP",
+"stack_version": "2.2"
+ },
+ "artifact_data": {
+"name": "HDFS",
+"sections": [
+ {
+"name": "HDFS_SUMMARY",
+"widgets": [
+ {
+"widget_name": "NAMENODE_HEAP",
+"widget_type": "GAUGE",
+"component_name": "NAMENODE",
+"display_name": "NameNode Heap",
+"time_created": ,
+"author": "me",
+"expression": [{"template":
"${jvmMemoryHeapUsed}/${jvmMemoryHeapMax}"}],
+"properties": {
+ "warning_threshold": 0.5,
+ "error_threshold": 0.7
+}
+ },
+ {
+"widget_name": "HDFS_BYTES_READ",
+"widget_type": "HEATMAP",
+"display_name": "HDFS Bytes Read",
+"time_created": 1112,
+"author": "me",
+"description": "",
+"component_name": "DATANODE",
+"expression": [{"template": "${metrics.dfs.datanode.bytes_read}"}],
+"properties": {
+ "display_unit": "MB",
+ "max_limit": "1024"
+}
+ }
+]
+ }
+]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/72bd502b/ambari-web/app/config.js
--
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 2bcdab4..6a5f564 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -71,7 +71,8 @@ App.supports = {
automatedKerberos: true,
customizeAgentUserAccount: false,
installGanglia: false,
- opsDuringRollingUpgrade: false
+ opsDuringRollingUpgrade: false,
+ customizedWidgets: false
};
if (App.enableExperimental) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/72bd502b/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js
b/ambari-web/app/controllers/main/service/item.js
index c7a840d..d4029af 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -767,6 +767,27 @@ App.MainServiceItemController = Em.Controller.extend({
console.warn('Error during executing custom command');
},
- isPending:true
+ isPending:true,
+
+ widgetsUrl: function () {
+return App.get('apiPrefix') + App.get('stackVersionURL') + '/services/' +
this.get('service.serviceName') + '/artifacts/widget_layout';
+ }.property('service.serviceName'),
+ widgetsMockUrl: '/data/widgets/service_widgets.json',
+
+ /**
+ * load service widgets
+ * @returns {$.Deferred}
+ */
+ loadWidgets: function () {
+var dfd = $.Deferred();
+var url = App.get('testMode') ? this.get('widgetsMockUrl') :
this.get('widgetsUrl');
+
+App.HttpClient.get(url, App.widgetMapper, {
+
ambari git commit: AMBARI-10104 Enhanced Configs: create models and mappers for tab sections and subsections. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 9fe2741dc -> ea1d531be
AMBARI-10104 Enhanced Configs: create models and mappers for tab sections and
subsections. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ea1d531b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea1d531b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea1d531b
Branch: refs/heads/trunk
Commit: ea1d531beb002af36e320550873594acae5147d4
Parents: 9fe2741
Author: aBabiichuk
Authored: Tue Mar 17 16:14:03 2015 +0200
Committer: aBabiichuk
Committed: Tue Mar 17 16:47:37 2015 +0200
--
.../app/assets/data/configurations/theme.json | 174 ++
ambari-web/app/assets/test/tests.js | 1 +
ambari-web/app/mappers.js | 1 +
.../mappers/configs/config_versions_mapper.js | 14 +-
ambari-web/app/mappers/configs/themes_mapper.js | 177 +++
ambari-web/app/models.js| 5 +-
.../app/models/configs/config_property.js | 46 +++-
ambari-web/app/models/configs/config_version.js | 10 +-
ambari-web/app/models/configs/section.js| 37 +++
.../app/models/configs/stack_config_property.js | 8 +-
ambari-web/app/models/configs/sub_section.js| 36 +++
ambari-web/app/models/configs/tab.js| 34 +++
ambari-web/app/utils/ajax/ajax.js | 6 +
ambari-web/app/utils/config.js | 59 +++--
.../views/common/configs/service_config_view.js | 32 +--
.../test/mappers/configs/themes_mapper_test.js | 225 +++
16 files changed, 800 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea1d531b/ambari-web/app/assets/data/configurations/theme.json
--
diff --git a/ambari-web/app/assets/data/configurations/theme.json
b/ambari-web/app/assets/data/configurations/theme.json
new file mode 100644
index 000..b756230
--- /dev/null
+++ b/ambari-web/app/assets/data/configurations/theme.json
@@ -0,0 +1,174 @@
+{
+ "Theme": {
+"name": "default",
+"service_name": "YARN",
+"description": "Default theme for YARN service",
+"configuration": {
+ "layouts": [
+{
+ "name": "default",
+ "tabs": [
+{
+ "name": "Settings",
+ "display-name": "Settings",
+ "layout": {
+"tab-columns": "1",
+"tab-rows": "2",
+"sections": [
+ {
+"name": "section-nm-sizing",
+"display-name": "NM Sizing",
+"row-index": "0",
+"column-span": "1",
+"column-index": "0",
+"row-span": "1",
+"section-columns": "1",
+"section-rows": "1",
+"subsections": []
+ },
+ {
+"name": "section-scheduler-defaults",
+"display-name": "Scheduler Defaults",
+"row-index": "1",
+"column-index": "0",
+"row-span": "1",
+"section-columns": "1",
+"section-rows": "1",
+"subsections": []
+ }
+]
+ }
+}
+ ]
+}
+ ]
+},
+"placement": {
+ "configuration-layout": "default",
+ "configs": [
+{
+ "config": "yarn.nodemanager.resource.memory-mb",
+ "section-name": "section-nm-sizing"
+},
+{
+ "config": "yarn.nodemanager.vmem-pmem-ratio",
+ "section-name": "section-nm-sizing"
+},
+{
+ "config": "yarn.nodemanager.resource.percentage-physical-cpu-limit",
+ "section-name": "section-nm-sizing"
+},
+{
+ "config": "yarn.nodemanager.resource.cpu-vcores",
+ "section-name": "section-nm-sizing"
+},
+{
+ "config": "yarn.scheduler.minimum-allocation-mb",
+ "section-name": "section-scheduler-defaults"
+},
+{
+ "config": "yarn.scheduler.maximum-allocation-mb",
+ "section-name": "section-scheduler-defaults"
+},
+{
+ "config": "yarn.scheduler.minimum-allocation-vcores",
+ "section-name": "section-scheduler-defaults"
+},
+{
+ "config": "yarn.scheduler.maximum-allocation-vcores",
+ "section-name": "section-scheduler-defaults"
+}
+ ]
+},
+"widgets":[
+ {
+"config":"yarn.nodemanager.resource.memory-mb",
+"widget":{
+ "type":"slider",
+
ambari git commit: AMBARI-10088. Technical debt: unit test coverage for Rolling Upgrade: Expose FinalizeUpgradeAction (dlysnichenko)
Repository: ambari Updated Branches: refs/heads/trunk 966d39333 -> 9fe2741dc AMBARI-10088. Technical debt: unit test coverage for Rolling Upgrade: Expose FinalizeUpgradeAction (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9fe2741d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9fe2741d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9fe2741d Branch: refs/heads/trunk Commit: 9fe2741dcc5fbee571ca9fd67ca026c45a480433 Parents: 966d393 Author: Lisnichenko Dmitro Authored: Tue Mar 17 15:56:08 2015 +0200 Committer: Lisnichenko Dmitro Committed: Tue Mar 17 15:56:08 2015 +0200 -- ambari-server/src/main/python/ambari-server.py | 4 +- .../main/python/ambari_server/serverUtils.py| 2 +- .../main/python/ambari_server/setupActions.py | 2 +- .../src/test/python/TestServerUpgrade.py| 100 +++ .../src/test/python/TestServerUtils.py | 49 + 5 files changed, 153 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/9fe2741d/ambari-server/src/main/python/ambari-server.py -- diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py index 9114abe..8b23d83 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -39,7 +39,7 @@ from ambari_server.setupHttps import setup_https from ambari_server.setupActions import BACKUP_ACTION, LDAP_SETUP_ACTION, LDAP_SYNC_ACTION, PSTART_ACTION, \ REFRESH_STACK_HASH_ACTION, RESET_ACTION, RESTORE_ACTION, SETUP_ACTION, SETUP_SECURITY_ACTION, START_ACTION, \ - STATUS_ACTION, STOP_ACTION, UPGRADE_ACTION, UPGRADE_STACK_ACTION, SETUP_JCE_ACTION, SET_CURRENT + STATUS_ACTION, STOP_ACTION, UPGRADE_ACTION, UPGRADE_STACK_ACTION, SETUP_JCE_ACTION, SET_CURRENT_ACTION from ambari_server.setupSecurity import setup_ldap, sync_ldap, setup_master_key, setup_ambari_krb5_jaas from ambari_server.userInput import get_validated_string_input @@ -501,7 +501,7 @@ def create_user_action_map(args, options): UPGRADE_STACK_ACTION: UserActionPossibleArgs(upgrade_stack, [2, 4], args), LDAP_SETUP_ACTION: UserAction(setup_ldap), LDAP_SYNC_ACTION: UserAction(sync_ldap, options), -SET_CURRENT: UserAction(set_current, options), +SET_CURRENT_ACTION: UserAction(set_current, options), SETUP_SECURITY_ACTION: UserActionRestart(setup_security, options), REFRESH_STACK_HASH_ACTION: UserAction(refresh_stack_hash_action), BACKUP_ACTION: UserActionPossibleArgs(backup, [1, 2], args), http://git-wip-us.apache.org/repos/asf/ambari/blob/9fe2741d/ambari-server/src/main/python/ambari_server/serverUtils.py -- diff --git a/ambari-server/src/main/python/ambari_server/serverUtils.py b/ambari-server/src/main/python/ambari_server/serverUtils.py index 7d76162..6466524 100644 --- a/ambari-server/src/main/python/ambari_server/serverUtils.py +++ b/ambari-server/src/main/python/ambari_server/serverUtils.py @@ -101,7 +101,7 @@ def refresh_stack_hash(properties): # Builds ambari-server API base url # Reads server protocol/port from configuration # And returns something like -# http://127.0.0.1:8080:/api/v1/ +# http://127.0.0.1:8080/api/v1/ # def get_ambari_server_api_base(properties): api_protocol = SERVER_API_PROTOCOL http://git-wip-us.apache.org/repos/asf/ambari/blob/9fe2741d/ambari-server/src/main/python/ambari_server/setupActions.py -- diff --git a/ambari-server/src/main/python/ambari_server/setupActions.py b/ambari-server/src/main/python/ambari_server/setupActions.py index 0cfe1d9..6c6e7ea 100644 --- a/ambari-server/src/main/python/ambari_server/setupActions.py +++ b/ambari-server/src/main/python/ambari_server/setupActions.py @@ -31,7 +31,7 @@ STATUS_ACTION = "status" SETUP_HTTPS_ACTION = "setup-https" LDAP_SETUP_ACTION = "setup-ldap" LDAP_SYNC_ACTION = "sync-ldap" -SET_CURRENT = "set-current" +SET_CURRENT_ACTION = "set-current" SETUP_GANGLIA_HTTPS_ACTION = "setup-ganglia-https" ENCRYPT_PASSWORDS_ACTION = "encrypt-passwords" SETUP_SECURITY_ACTION = "setup-security" http://git-wip-us.apache.org/repos/asf/ambari/blob/9fe2741d/ambari-server/src/test/python/TestServerUpgrade.py -- diff --git a/ambari-server/src/test/python/TestServerUpgrade.py b/ambari-server/src/test/python/TestServerUpgrade.py new file mode 100644 index 000..05b48fa --- /dev/null +++ b/ambari-server/src/test/python/TestServerUpgrade.py @@ -0,0 +1,100 @@ +''' +License
ambari git commit: AMBARI-10083 - Ambari Agent Alerts Prevents Binding to the Ping Port Listener On Startup (part 2) (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 8a821dbf2 -> 966d39333
AMBARI-10083 - Ambari Agent Alerts Prevents Binding to the Ping Port Listener
On Startup (part 2) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/966d3933
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/966d3933
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/966d3933
Branch: refs/heads/trunk
Commit: 966d39333e60b9b0c2a0b01954f067471e87c152
Parents: 8a821db
Author: Jonathan Hurley
Authored: Tue Mar 17 09:43:01 2015 -0400
Committer: Jonathan Hurley
Committed: Tue Mar 17 09:43:01 2015 -0400
--
ambari-agent/src/test/python/ambari_agent/TestController.py | 8
.../src/test/python/ambari_agent/TestProcessHelper.py| 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/966d3933/ambari-agent/src/test/python/ambari_agent/TestController.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestController.py
b/ambari-agent/src/test/python/ambari_agent/TestController.py
index 92ce46f..e2fd7a7 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestController.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestController.py
@@ -339,12 +339,12 @@ class TestController(unittest.TestCase):
self.assertTrue(sendRequestMock.call_count > 5)
- @patch("os._exit")
- def test_restartAgent(self, os_exit_mock):
+ @patch("sys.exit")
+ def test_restartAgent(self, sys_exit_mock):
self.controller.restartAgent()
-self.assertTrue(os_exit_mock.called)
-self.assertTrue(os_exit_mock.call_args[0][0] ==
AGENT_AUTO_RESTART_EXIT_CODE)
+self.assertTrue(sys_exit_mock.called)
+self.assertTrue(sys_exit_mock.call_args[0][0] ==
AGENT_AUTO_RESTART_EXIT_CODE)
@patch("urllib2.Request")
http://git-wip-us.apache.org/repos/asf/ambari/blob/966d3933/ambari-agent/src/test/python/ambari_agent/TestProcessHelper.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestProcessHelper.py
b/ambari-agent/src/test/python/ambari_agent/TestProcessHelper.py
index 35af423..b0b828d 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestProcessHelper.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestProcessHelper.py
@@ -47,13 +47,13 @@ class TestProcessHelper(unittest.TestCase):
self.assertFalse(os.path.exists(tf3.name))
- @patch("os._exit")
+ @patch("sys.exit")
@patch.object(ProcessHelper, "_clean")
- def test_stopAgent(self, _clean_mock, exitMock):
+ def test_stopAgent(self, _clean_mock, sys_exit_mock):
ProcessHelper.stopAgent()
self.assertTrue(_clean_mock.called)
-self.assertTrue(exitMock.called)
+self.assertTrue(sys_exit_mock.called)
@patch("os.execvp")
ambari git commit: AMBARI-10083 - Ambari Agent Alerts Prevents Binding to the Ping Port Listener On Startup (part 2) (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 15020c0c2 -> b16c3f17f
AMBARI-10083 - Ambari Agent Alerts Prevents Binding to the Ping Port Listener
On Startup (part 2) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b16c3f17
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b16c3f17
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b16c3f17
Branch: refs/heads/branch-2.0.0
Commit: b16c3f17f4a117e798783abf468b6a6158eba982
Parents: 15020c0
Author: Jonathan Hurley
Authored: Tue Mar 17 09:43:01 2015 -0400
Committer: Jonathan Hurley
Committed: Tue Mar 17 09:43:56 2015 -0400
--
ambari-agent/src/test/python/ambari_agent/TestController.py | 8
.../src/test/python/ambari_agent/TestProcessHelper.py| 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b16c3f17/ambari-agent/src/test/python/ambari_agent/TestController.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestController.py
b/ambari-agent/src/test/python/ambari_agent/TestController.py
index 92ce46f..e2fd7a7 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestController.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestController.py
@@ -339,12 +339,12 @@ class TestController(unittest.TestCase):
self.assertTrue(sendRequestMock.call_count > 5)
- @patch("os._exit")
- def test_restartAgent(self, os_exit_mock):
+ @patch("sys.exit")
+ def test_restartAgent(self, sys_exit_mock):
self.controller.restartAgent()
-self.assertTrue(os_exit_mock.called)
-self.assertTrue(os_exit_mock.call_args[0][0] ==
AGENT_AUTO_RESTART_EXIT_CODE)
+self.assertTrue(sys_exit_mock.called)
+self.assertTrue(sys_exit_mock.call_args[0][0] ==
AGENT_AUTO_RESTART_EXIT_CODE)
@patch("urllib2.Request")
http://git-wip-us.apache.org/repos/asf/ambari/blob/b16c3f17/ambari-agent/src/test/python/ambari_agent/TestProcessHelper.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestProcessHelper.py
b/ambari-agent/src/test/python/ambari_agent/TestProcessHelper.py
index 35af423..b0b828d 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestProcessHelper.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestProcessHelper.py
@@ -47,13 +47,13 @@ class TestProcessHelper(unittest.TestCase):
self.assertFalse(os.path.exists(tf3.name))
- @patch("os._exit")
+ @patch("sys.exit")
@patch.object(ProcessHelper, "_clean")
- def test_stopAgent(self, _clean_mock, exitMock):
+ def test_stopAgent(self, _clean_mock, sys_exit_mock):
ProcessHelper.stopAgent()
self.assertTrue(_clean_mock.called)
-self.assertTrue(exitMock.called)
+self.assertTrue(sys_exit_mock.called)
@patch("os.execvp")
ambari git commit: AMBARI-10099 - Web Alerts Create Confusing Errors And Warnings (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 ac882c67f -> 15020c0c2
AMBARI-10099 - Web Alerts Create Confusing Errors And Warnings (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/15020c0c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/15020c0c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/15020c0c
Branch: refs/heads/branch-2.0.0
Commit: 15020c0c2fca7cc4e85023bd280b828a979325ce
Parents: ac882c6
Author: Jonathan Hurley
Authored: Mon Mar 16 22:42:28 2015 -0400
Committer: Jonathan Hurley
Committed: Tue Mar 17 09:23:20 2015 -0400
--
.../python/ambari_agent/alerts/web_alert.py | 31 +++-
.../src/test/python/ambari_agent/TestAlerts.py | 8 ++---
.../FALCON/0.5.0.2.1/alerts.json| 4 +--
.../common-services/HDFS/2.1.0.2.0/alerts.json | 8 ++---
.../common-services/OOZIE/4.0.0.2.0/alerts.json | 4 +--
.../common-services/STORM/0.9.1.2.1/alerts.json | 4 +--
.../common-services/YARN/2.1.0.2.0/alerts.json | 16 +-
.../stacks/BIGTOP/0.8/services/HDFS/alerts.json | 8 ++---
.../BIGTOP/0.8/services/OOZIE/alerts.json | 4 +--
.../stacks/BIGTOP/0.8/services/YARN/alerts.json | 16 +-
10 files changed, 58 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/15020c0c/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
b/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
index 2db4996..1a6540a 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
@@ -23,6 +23,7 @@ import time
import subprocess
import os
import urllib2
+from urllib2 import HTTPError
import uuid
from tempfile import gettempdir
@@ -89,10 +90,12 @@ class WebAlert(BaseAlert):
if status_code == 0:
return (self.RESULT_CRITICAL, [status_code, url, time_seconds,
error_message])
+# anything that's less than 400 is OK
if status_code < 400:
return (self.RESULT_OK, [status_code, url, time_seconds])
-return (self.RESULT_WARNING, [status_code, url, time_seconds])
+# everything else is WARNING
+return (self.RESULT_WARNING, [status_code, url, time_seconds,
error_message])
def _build_web_query(self, alert_uri):
@@ -140,6 +143,7 @@ class WebAlert(BaseAlert):
"""
try:
+ response_code = 0
kerberos_keytab = None
kerberos_principal = None
@@ -199,22 +203,26 @@ class WebAlert(BaseAlert):
'%{http_code}', url, '--connect-timeout', CURL_CONNECTION_TIMEOUT,
'-o', '/dev/null'], stdout=subprocess.PIPE,
stderr=subprocess.PIPE, env=kerberos_env)
- out, err = curl.communicate()
+ curl_stdout, curl_stderr = curl.communicate()
finally:
if os.path.isfile(cookie_file):
os.remove(cookie_file)
-if err != '':
- raise Exception(err)
+# empty quotes evaluates to false
+if curl_stderr:
+ raise Exception(curl_stderr)
+
+# empty quotes evaluates to false
+if curl_stdout:
+ response_code = int(curl_stdout)
-response_code = int(out)
time_millis = time.time() - start_time
else:
# kerberos is not involved; use urllib2
-response_code, time_millis = self._make_web_request_urllib(url)
+response_code, time_millis, error_msg =
self._make_web_request_urllib(url)
return WebResponse(status_code=response_code, time_millis=time_millis,
-error_msg=None)
+error_msg=error_msg)
except Exception, exception:
if logger.isEnabledFor(logging.DEBUG):
@@ -230,6 +238,8 @@ class WebAlert(BaseAlert):
:return: a tuple of the response code and the total time in ms
"""
response = None
+error_message = None
+
start_time = time.time()
try:
@@ -237,7 +247,12 @@ class WebAlert(BaseAlert):
response_code = response.getcode()
time_millis = time.time() - start_time
- return response_code, time_millis
+ return response_code, time_millis, error_message
+except HTTPError, httpError:
+ time_millis = time.time() - start_time
+ error_message = str(httpError)
+
+ return httpError.code, time_millis, error_message
finally:
if response is not None:
try:
http://git-wip-us.apache.org/repos/asf/ambari/blob/15020c0c/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
ambari git commit: AMBARI-10099 - Web Alerts Create Confusing Errors And Warnings (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk ff711095e -> 8a821dbf2
AMBARI-10099 - Web Alerts Create Confusing Errors And Warnings (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a821dbf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a821dbf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a821dbf
Branch: refs/heads/trunk
Commit: 8a821dbf2d5ae61e30a5dbbf40b1b866c25276e0
Parents: ff71109
Author: Jonathan Hurley
Authored: Mon Mar 16 22:42:28 2015 -0400
Committer: Jonathan Hurley
Committed: Tue Mar 17 09:22:55 2015 -0400
--
.../python/ambari_agent/alerts/web_alert.py | 31 +++-
.../src/test/python/ambari_agent/TestAlerts.py | 8 ++---
.../FALCON/0.5.0.2.1/alerts.json| 4 +--
.../common-services/HDFS/2.1.0.2.0/alerts.json | 8 ++---
.../common-services/OOZIE/4.0.0.2.0/alerts.json | 4 +--
.../common-services/STORM/0.9.1.2.1/alerts.json | 4 +--
.../common-services/YARN/2.1.0.2.0/alerts.json | 16 +-
.../stacks/BIGTOP/0.8/services/HDFS/alerts.json | 8 ++---
.../BIGTOP/0.8/services/OOZIE/alerts.json | 4 +--
.../stacks/BIGTOP/0.8/services/YARN/alerts.json | 16 +-
10 files changed, 58 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a821dbf/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
b/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
index 2db4996..1a6540a 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
@@ -23,6 +23,7 @@ import time
import subprocess
import os
import urllib2
+from urllib2 import HTTPError
import uuid
from tempfile import gettempdir
@@ -89,10 +90,12 @@ class WebAlert(BaseAlert):
if status_code == 0:
return (self.RESULT_CRITICAL, [status_code, url, time_seconds,
error_message])
+# anything that's less than 400 is OK
if status_code < 400:
return (self.RESULT_OK, [status_code, url, time_seconds])
-return (self.RESULT_WARNING, [status_code, url, time_seconds])
+# everything else is WARNING
+return (self.RESULT_WARNING, [status_code, url, time_seconds,
error_message])
def _build_web_query(self, alert_uri):
@@ -140,6 +143,7 @@ class WebAlert(BaseAlert):
"""
try:
+ response_code = 0
kerberos_keytab = None
kerberos_principal = None
@@ -199,22 +203,26 @@ class WebAlert(BaseAlert):
'%{http_code}', url, '--connect-timeout', CURL_CONNECTION_TIMEOUT,
'-o', '/dev/null'], stdout=subprocess.PIPE,
stderr=subprocess.PIPE, env=kerberos_env)
- out, err = curl.communicate()
+ curl_stdout, curl_stderr = curl.communicate()
finally:
if os.path.isfile(cookie_file):
os.remove(cookie_file)
-if err != '':
- raise Exception(err)
+# empty quotes evaluates to false
+if curl_stderr:
+ raise Exception(curl_stderr)
+
+# empty quotes evaluates to false
+if curl_stdout:
+ response_code = int(curl_stdout)
-response_code = int(out)
time_millis = time.time() - start_time
else:
# kerberos is not involved; use urllib2
-response_code, time_millis = self._make_web_request_urllib(url)
+response_code, time_millis, error_msg =
self._make_web_request_urllib(url)
return WebResponse(status_code=response_code, time_millis=time_millis,
-error_msg=None)
+error_msg=error_msg)
except Exception, exception:
if logger.isEnabledFor(logging.DEBUG):
@@ -230,6 +238,8 @@ class WebAlert(BaseAlert):
:return: a tuple of the response code and the total time in ms
"""
response = None
+error_message = None
+
start_time = time.time()
try:
@@ -237,7 +247,12 @@ class WebAlert(BaseAlert):
response_code = response.getcode()
time_millis = time.time() - start_time
- return response_code, time_millis
+ return response_code, time_millis, error_message
+except HTTPError, httpError:
+ time_millis = time.time() - start_time
+ error_message = str(httpError)
+
+ return httpError.code, time_millis, error_message
finally:
if response is not None:
try:
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a821dbf/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
b/ambari-age
ambari git commit: AMBARI-10086 ZooKeeper Server Process alert always checks default port (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 1152fc081 -> ac882c67f
AMBARI-10086 ZooKeeper Server Process alert always checks default port (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ac882c67
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ac882c67
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ac882c67
Branch: refs/heads/branch-2.0.0
Commit: ac882c67fc44a052cc1dd4cc6ff921cf8efc7064
Parents: 1152fc0
Author: Dmytro Sen
Authored: Tue Mar 17 12:54:18 2015 +0200
Committer: Dmytro Sen
Committed: Tue Mar 17 12:55:53 2015 +0200
--
.../resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ac882c67/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json
--
diff --git
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json
index 5344414..d27fe02 100644
---
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json
+++
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json
@@ -36,7 +36,7 @@
"scope": "ANY",
"source": {
"type": "PORT",
- "uri": "{{zookeeper-env/clientPort}}",
+ "uri": "{{zoo.cfg/clientPort}}",
"default_port": 2181,
"reporting": {
"ok": {
@@ -55,4 +55,4 @@
}
]
}
-}
\ No newline at end of file
+}
ambari git commit: AMBARI-10086 ZooKeeper Server Process alert always checks default port (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 9a2214f1c -> ff711095e
AMBARI-10086 ZooKeeper Server Process alert always checks default port (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ff711095
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ff711095
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ff711095
Branch: refs/heads/trunk
Commit: ff711095e1e3300798af8fa5bcef49ff8dd97176
Parents: 9a2214f
Author: Dmytro Sen
Authored: Tue Mar 17 12:52:32 2015 +0200
Committer: Dmytro Sen
Committed: Tue Mar 17 12:54:18 2015 +0200
--
.../resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ff711095/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json
--
diff --git
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json
index 5344414..d27fe02 100644
---
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json
+++
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/alerts.json
@@ -36,7 +36,7 @@
"scope": "ANY",
"source": {
"type": "PORT",
- "uri": "{{zookeeper-env/clientPort}}",
+ "uri": "{{zoo.cfg/clientPort}}",
"default_port": 2181,
"reporting": {
"ok": {
@@ -55,4 +55,4 @@
}
]
}
-}
\ No newline at end of file
+}
ambari git commit: AMBARI-9272 - [WinGA] Views Files, Capacity-Scheduler, Pig views do not compile on Windows
Repository: ambari
Updated Branches:
refs/heads/trunk 4f84615da -> 9a2214f1c
AMBARI-9272 - [WinGA] Views Files, Capacity-Scheduler, Pig views do not compile
on Windows
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a2214f1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a2214f1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a2214f1
Branch: refs/heads/trunk
Commit: 9a2214f1c0388b8f3df5c29b2d4fb4bcf70bf799
Parents: 4f84615
Author: Artem Baranchuk
Authored: Fri Mar 13 12:57:41 2015 +0200
Committer: Artem Baranchuk
Committed: Tue Mar 17 12:45:43 2015 +0200
--
contrib/views/capacity-scheduler/pom.xml| 85 ++--
.../src/main/resources/ui/package.json | 3 +-
contrib/views/files/pom.xml | 129 +--
.../files/src/main/resources/ui/package.json| 5 +-
contrib/views/pig/pom.xml | 85 ++--
.../src/main/resources/ui/pig-web/package.json | 3 +-
6 files changed, 238 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a2214f1/contrib/views/capacity-scheduler/pom.xml
--
diff --git a/contrib/views/capacity-scheduler/pom.xml
b/contrib/views/capacity-scheduler/pom.xml
index 57effe8..2712953 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -78,13 +78,31 @@
+org.apache.maven.plugins
+maven-clean-plugin
+2.5
+
+
+
+ ${ui.directory}
+ false
+
+public/**
+node_modules/**
+bower_components/**
+node/**
+
+
+
+
+
+
com.github.eirslett
frontend-maven-plugin
0.0.14
-src/main/resources/ui
+${ui.directory}
-
install node and npm
@@ -92,22 +110,20 @@
install-node-and-npm
-generate-resources
+initialize
v0.10.26
1.4.3
- npm install
+npm install
npm
-
generate-resources
-
-install --unsafe-perm
--registry=http://registry.npmjs.eu
+ install --unsafe-perm
--registry=http://registry.npmjs.eu
@@ -117,21 +133,38 @@
org.codehaus.mojo
1.2.1
-
+
+node gyp executable
+initialize
+
+ exec
+
+
+ ${skip.nodegyp.chmod}
+ ${ui.directory}
+ chmod
+
++x
+
${ui.directory}/node/npm/bin/node-gyp-bin/node-gyp
+
+
+
+
Brunch build
generate-resources
exec
-
${basedir}/src/main/resources/ui
- node/node
+ ${ui.directory}
+ ${ui.directory}/node/${node.executable}
-node_modules/.bin/brunch
+node_modules/brunch/bin/brunch
build
+--production
-
+
@@ -244,4 +277,30 @@
-
+
+
+windows
+
+
+win
+
+
+
+ node.exe
+ true
+
+
+
+linux
+
+
+unix
+
+
+
+ node
+ false
+
+
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a2214f1/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
--
diff --git
a/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
b/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
index 11737d4..47f29b7 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
@@ -12,8 +12,7 @@
},
"scripts": {
"start": "brunch watch --server",
-"preinstall": "chmod +x node/npm/bin/node-gyp-bin/node-gyp",
-"postinstall" : "bash node/with_new_path.sh node node_modules/.bin/bower
--allow-root install"
+"postinstall" : "bower --a
ambari git commit: AMBARI-10100 WEBHCAT_SERVER START is failed after Ambari only upgrade from 1.4.4 to 2.0.0 (failed, parent directory /etc/hive-webhcat doesn't exist) (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 e35afcaa5 -> 1152fc081
AMBARI-10100 WEBHCAT_SERVER START is failed after Ambari only upgrade from
1.4.4 to 2.0.0 (failed, parent directory /etc/hive-webhcat doesn't exist) (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1152fc08
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1152fc08
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1152fc08
Branch: refs/heads/branch-2.0.0
Commit: 1152fc081e1c062a12a3721f4533879ba0b8d4c1
Parents: e35afca
Author: Dmytro Sen
Authored: Tue Mar 17 12:36:36 2015 +0200
Committer: Dmytro Sen
Committed: Tue Mar 17 12:38:24 2015 +0200
--
.../common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py | 1 +
.../src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1152fc08/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
index b2008ab..4f1d564 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
@@ -150,6 +150,7 @@ def webhcat():
Directory(params.webhcat_conf_dir,
cd_access='a',
+ recursive=True
)
log4j_webhcat_filename = 'webhcat-log4j.properties'
http://git-wip-us.apache.org/repos/asf/ambari/blob/1152fc08/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
index d070980..e8a34fd 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
@@ -214,6 +214,7 @@ class TestWebHCatServer(RMFTestCase):
)
self.assertResourceCalled('Directory', '/etc/hive-webhcat/conf',
cd_access = 'a',
+recursive=True
)
self.assertResourceCalled('File',
'/etc/hcatalog/conf/webhcat-log4j.properties',
content = 'log4jproperties\nline2',
@@ -325,6 +326,7 @@ class TestWebHCatServer(RMFTestCase):
)
self.assertResourceCalled('Directory', '/etc/hive-webhcat/conf',
cd_access = 'a',
+recursive=True
)
self.assertResourceCalled('File',
'/etc/hcatalog/conf/webhcat-log4j.properties',
content = 'log4jproperties\nline2',
@@ -446,4 +448,4 @@ class TestWebHCatServer(RMFTestCase):
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES
)
-put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"})
\ No newline at end of file
+put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"})
ambari git commit: AMBARI-10100 WEBHCAT_SERVER START is failed after Ambari only upgrade from 1.4.4 to 2.0.0 (failed, parent directory /etc/hive-webhcat doesn't exist) (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 80afc9f02 -> 4f84615da
AMBARI-10100 WEBHCAT_SERVER START is failed after Ambari only upgrade from
1.4.4 to 2.0.0 (failed, parent directory /etc/hive-webhcat doesn't exist) (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4f84615d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f84615d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f84615d
Branch: refs/heads/trunk
Commit: 4f84615da39c64aab3ee31b23420b98db7926223
Parents: 80afc9f
Author: Dmytro Sen
Authored: Tue Mar 17 12:36:14 2015 +0200
Committer: Dmytro Sen
Committed: Tue Mar 17 12:36:36 2015 +0200
--
.../common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py | 1 +
.../src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f84615d/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
index b2008ab..4f1d564 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/webhcat.py
@@ -150,6 +150,7 @@ def webhcat():
Directory(params.webhcat_conf_dir,
cd_access='a',
+ recursive=True
)
log4j_webhcat_filename = 'webhcat-log4j.properties'
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f84615d/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
index d070980..e8a34fd 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_webhcat_server.py
@@ -214,6 +214,7 @@ class TestWebHCatServer(RMFTestCase):
)
self.assertResourceCalled('Directory', '/etc/hive-webhcat/conf',
cd_access = 'a',
+recursive=True
)
self.assertResourceCalled('File',
'/etc/hcatalog/conf/webhcat-log4j.properties',
content = 'log4jproperties\nline2',
@@ -325,6 +326,7 @@ class TestWebHCatServer(RMFTestCase):
)
self.assertResourceCalled('Directory', '/etc/hive-webhcat/conf',
cd_access = 'a',
+recursive=True
)
self.assertResourceCalled('File',
'/etc/hcatalog/conf/webhcat-log4j.properties',
content = 'log4jproperties\nline2',
@@ -446,4 +448,4 @@ class TestWebHCatServer(RMFTestCase):
hdp_stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES
)
-put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"})
\ No newline at end of file
+put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"})
ambari git commit: AMBARI-10061 Alert Failures on Windows (echekanskiy via fbarca)
Repository: ambari
Updated Branches:
refs/heads/trunk de3667a21 -> 80afc9f02
AMBARI-10061 Alert Failures on Windows (echekanskiy via fbarca)
Alerts for oozie, storm and ams are broken on windows os.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/80afc9f0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/80afc9f0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/80afc9f0
Branch: refs/heads/trunk
Commit: 80afc9f027244eb17cd32c778f47e0bfd2398bf0
Parents: de3667a
Author: Florian Barca
Authored: Tue Mar 17 03:25:57 2015 -0700
Committer: Florian Barca
Committed: Tue Mar 17 03:25:57 2015 -0700
--
.../alerts/alert_ambari_metrics_monitor.py | 18 ++
.../configuration/falcon-startup.properties.xml | 26 ---
.../package/alerts/alert_check_oozie_server.py | 105 ++-
.../HDPWIN/2.1/services/STORM/alerts.json | 174 +++
.../package/alerts/check_supervisor_process.py | 49 ++
5 files changed, 304 insertions(+), 68 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/80afc9f0/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py
--
diff --git
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py
index 3e87e25..04a2e01 100644
---
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py
+++
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py
@@ -23,7 +23,11 @@ import socket
from resource_management.libraries.functions.check_process_status import
check_process_status
from resource_management.core.exceptions import ComponentIsNotRunning
+from ambari_commons import OSCheck, OSConst
+from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
+if OSCheck.is_windows_family():
+ from resource_management.libraries.functions.windows_service_utils import
check_windows_service_status
RESULT_CODE_OK = 'OK'
RESULT_CODE_CRITICAL = 'CRITICAL'
RESULT_CODE_UNKNOWN = 'UNKNOWN'
@@ -37,7 +41,21 @@ def get_tokens():
"""
return (AMS_MONITOR_PID_DIR,)
+@OsFamilyFuncImpl(OSConst.WINSRV_FAMILY)
+def is_monitor_process_live(pid_file=None):
+ """
+ Gets whether the Metrics Monitor Service is running.
+ :param pid_file: ignored
+ :return: True if the monitor is running, False otherwise
+ """
+ try:
+check_windows_service_status("AmbariMetricsHostMonitoring")
+ams_monitor_process_running = True
+ except:
+ams_monitor_process_running = False
+ return ams_monitor_process_running
+@OsFamilyFuncImpl(OsFamilyImpl.DEFAULT)
def is_monitor_process_live(pid_file):
"""
Gets whether the Metrics Monitor represented by the specified file is
running.
http://git-wip-us.apache.org/repos/asf/ambari/blob/80afc9f0/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
index 252fed4..6a35c17 100644
---
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
+++
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
@@ -183,30 +183,4 @@
DEFAULT
The kerberos names rules is to resolve kerberos principal
names, refer to Hadoop's KerberosName for more details.
-
-
-*.falcon.service.authentication.kerberos.principal
-falcon/_h...@example.com
-
-
-
-*.falcon.service.authentication.kerberos.keytab
-/etc/security/keytabs/falcon.service.keytab
-
-
-
-*.dfs.namenode.kerberos.principal
-nn/_h...@example.com
-name node principal to talk to config store
-
-
-*.falcon.http.authentication.kerberos.principal
-HTTP/_h...@example.com
-Indicates the Kerberos principal to be used for HTTP
endpoint
-
-
-*.falcon.http.authentication.kerberos.keytab
-/etc/security/keytabs/spnego.service.keytab
-Location of the keytab file with the credentials for the HTTP
principal
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/80afc9f0/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py
ambari git commit: AMBARI-10094 Kerberos: disable edit on generated ambari principal and keytab configs. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 2cbf236eb -> de3667a21
AMBARI-10094 Kerberos: disable edit on generated ambari principal and keytab
configs. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/de3667a2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/de3667a2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/de3667a2
Branch: refs/heads/trunk
Commit: de3667a2195fd7796bc5a9cbc4f7a79d945979b9
Parents: 2cbf236
Author: Andrii Tkach
Authored: Tue Mar 17 11:40:46 2015 +0200
Committer: Andrii Tkach
Committed: Tue Mar 17 11:40:46 2015 +0200
--
ambari-web/app/data/HDP2/site_properties.js | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/de3667a2/ambari-web/app/data/HDP2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2/site_properties.js
b/ambari-web/app/data/HDP2/site_properties.js
index 3b7c198..b09d0cf 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -4545,36 +4545,42 @@ var hdp2properties = [
"name": "smokeuser_principal_name",
"displayName": "Smoke user principal",
"category": "Ambari Principals",
+"filename": "cluster-env.xml",
"index": 1
},
{
"name": "smokeuser_keytab",
"displayName": "Smoke user keytab",
"category": "Ambari Principals",
+"filename": "cluster-env.xml",
"index": 2
},
{
"name": "hdfs_principal_name",
"displayName": "HDFS user principal",
"category": "Ambari Principals",
+"filename": "hadoop-env.xml",
"index": 3
},
{
"name": "hdfs_user_keytab",
"displayName": "HDFS user keytab",
"category": "Ambari Principals",
+"filename": "hadoop-env.xml",
"index": 4
},
{
"name": "hbase_principal_name",
"displayName": "HBase user principal",
"category": "Ambari Principals",
+"filename": "hbase-env.xml",
"index": 5
},
{
"name": "hbase_user_keytab",
"displayName": "HBase user keytab",
"category": "Ambari Principals",
+"filename": "hbase-env.xml",
"index": 6
}
];
