You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2017/06/06 12:49:54 UTC
[1/3] ambari git commit: AMBARI-20952. Collection added to itself
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 f585da99e -> 54ce6cca4
AMBARI-20952. Collection added to itself
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af0bbce2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af0bbce2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af0bbce2
Branch: refs/heads/branch-2.5
Commit: af0bbce27453a4a72a2f1931fad123195da041f8
Parents: f585da9
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Mon May 8 10:39:22 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Tue Jun 6 14:29:01 2017 +0200
----------------------------------------------------------------------
.../server/stack/QuickLinksConfigurationModule.java | 2 +-
.../org/apache/ambari/server/stack/ThemeModule.java | 2 +-
.../server/stack/QuickLinksConfigurationModuleTest.java | 11 +++++++++++
.../org/apache/ambari/server/stack/ThemeModuleTest.java | 12 ++++++++++--
4 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/af0bbce2/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
index ed8e8cf..efac6ec 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
@@ -129,7 +129,7 @@ public class QuickLinksConfigurationModule extends BaseModule<QuickLinksConfigur
@Override
public void addErrors(Collection<String> errors) {
- errors.addAll(errors);
+ this.errors.addAll(errors);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/af0bbce2/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
index 30c1f1b..5cad213 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
@@ -129,7 +129,7 @@ public class ThemeModule extends BaseModule<ThemeModule, ThemeInfo> implements V
@Override
public void addErrors(Collection<String> errors) {
- errors.addAll(errors);
+ this.errors.addAll(errors);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/af0bbce2/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
index f571dda..374e294 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
@@ -18,7 +18,9 @@
package org.apache.ambari.server.stack;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
+
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.state.quicklinks.Check;
import org.apache.ambari.server.state.quicklinks.Link;
@@ -33,12 +35,21 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static org.junit.Assert.*;
public class QuickLinksConfigurationModuleTest {
@Test
+ public void testAddErrors() {
+ Set<String> errors = ImmutableSet.of("one error", "two errors");
+ QuickLinksConfigurationModule module = new QuickLinksConfigurationModule((File) null);
+ module.addErrors(errors);
+ assertEquals(errors, ImmutableSet.copyOf(module.getErrors()));
+ }
+
+ @Test
public void testResolveInherit() throws Exception{
QuickLinks[] results = resolveQuickLinks("parent_quicklinks.json", "child_quicklinks_to_inherit.json");
QuickLinks parentQuickLinks = results[0];
http://git-wip-us.apache.org/repos/asf/ambari/blob/af0bbce2/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
index f4f45a7..dfb9382 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
@@ -22,11 +22,13 @@ import org.apache.ambari.server.state.theme.Theme;
import org.junit.Test;
import java.io.File;
+import java.util.Set;
import static org.junit.Assert.*;
-public class ThemeModuleTest {
+import com.google.common.collect.ImmutableSet;
+public class ThemeModuleTest {
@Test
public void testResolve() throws Exception {
@@ -48,7 +50,13 @@ public class ThemeModuleTest {
assertEquals(10, parentTheme.getThemeConfiguration().getWidgets().size());
assertEquals(12, childTheme.getThemeConfiguration().getWidgets().size());
+ }
-
+ @Test
+ public void testAddErrors() {
+ Set<String> errors = ImmutableSet.of("one error", "two errors");
+ ThemeModule module = new ThemeModule((File) null);
+ module.addErrors(errors);
+ assertEquals(errors, ImmutableSet.copyOf(module.getErrors()));
}
}
\ No newline at end of file
[2/3] ambari git commit: AMBARI-20918. AmbariServer Metrics service
cannot be disabled
Posted by ad...@apache.org.
AMBARI-20918. AmbariServer Metrics service cannot be disabled
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97a51aaf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97a51aaf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97a51aaf
Branch: refs/heads/branch-2.5
Commit: 97a51aaf924d4d9e385f7e4751d50f4617c609c5
Parents: af0bbce
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Wed May 3 14:34:02 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Tue Jun 6 14:29:42 2017 +0200
----------------------------------------------------------------------
.../org/apache/ambari/server/configuration/Configuration.java | 5 +++++
.../java/org/apache/ambari/server/controller/AmbariServer.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/97a51aaf/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index c1cd033..fa5ed71 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -5095,6 +5095,11 @@ public class Configuration {
return Boolean.parseBoolean(getProperty(TIMELINE_METRICS_CACHE_DISABLE));
}
+ /** @see #AMBARISERVER_METRICS_DISABLE */
+ public boolean isMetricsServiceDisabled() {
+ return Boolean.parseBoolean(getProperty(AMBARISERVER_METRICS_DISABLE));
+ }
+
/**
* Constant fudge factor subtracted from the cache update requests to
* account for unavailability of data on the trailing edge due to buffering.
http://git-wip-us.apache.org/repos/asf/ambari/blob/97a51aaf/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 3de2b87..e8c986b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -568,7 +568,7 @@ public class AmbariServer {
serviceManager.startAsync();
LOG.info("********* Started Services **********");
- if (!Configuration.AMBARISERVER_METRICS_DISABLE.equals(true)) {
+ if (!configs.isMetricsServiceDisabled()) {
metricsService.start();
} else {
LOG.info("AmbariServer Metrics disabled.");
[3/3] ambari git commit: AMBARI-21133. Configure Ambari Identity
fails with "Cannot run program: ambari-sudo.sh" on Ubuntu
Posted by ad...@apache.org.
AMBARI-21133. Configure Ambari Identity fails with "Cannot run program: ambari-sudo.sh" on Ubuntu
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/54ce6cca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54ce6cca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54ce6cca
Branch: refs/heads/branch-2.5
Commit: 54ce6cca4ce2f37b07c8574e9fc9d621d62ad704
Parents: 97a51aa
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Fri May 26 16:36:04 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Tue Jun 6 14:30:10 2017 +0200
----------------------------------------------------------------------
ambari-server/conf/unix/ambari-env.sh | 2 +-
ambari-server/src/main/python/ambari_server_main.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/54ce6cca/ambari-server/conf/unix/ambari-env.sh
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari-env.sh b/ambari-server/conf/unix/ambari-env.sh
index 33912b6..7c91c85 100644
--- a/ambari-server/conf/unix/ambari-env.sh
+++ b/ambari-server/conf/unix/ambari-env.sh
@@ -15,7 +15,7 @@
AMBARI_PASSHPHRASE="DEV"
-export AMBARI_JVM_ARGS=$AMBARI_JVM_ARGS' -Xms512m -Xmx2048m -XX:MaxPermSize=128m -Djava.security.auth.login.config=$ROOT/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false'
+export AMBARI_JVM_ARGS="$AMBARI_JVM_ARGS -Xms512m -Xmx2048m -XX:MaxPermSize=128m -Djava.security.auth.login.config=$ROOT/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false"
export PATH=$PATH:$ROOT/var/lib/ambari-server
export PYTHONPATH=$PYTHONPATH:$ROOT/usr/lib/python2.6/site-packages
http://git-wip-us.apache.org/repos/asf/ambari/blob/54ce6cca/ambari-server/src/main/python/ambari_server_main.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server_main.py b/ambari-server/src/main/python/ambari_server_main.py
index bf4f6d3..de8f317 100644
--- a/ambari-server/src/main/python/ambari_server_main.py
+++ b/ambari-server/src/main/python/ambari_server_main.py
@@ -184,7 +184,7 @@ def generate_child_process_param_list(ambari_user, java_exe, class_path,
# from subprocess, we have to skip --login option of su command. That's why
# we change dir to / (otherwise subprocess can face with 'permission denied'
# errors while trying to list current directory
- cmd = "{ulimit_cmd} ; {su} {ambari_user} -s {sh_shell} -c 'source {ambari_env_file} ; {command}'".format(ulimit_cmd=ulimit_cmd,
+ cmd = "{ulimit_cmd} ; {su} {ambari_user} -s {sh_shell} -c '. {ambari_env_file} && {command}'".format(ulimit_cmd=ulimit_cmd,
su=locate_file('su', '/bin'), ambari_user=ambari_user,
sh_shell=locate_file('sh', '/bin'), command=command,
ambari_env_file=AMBARI_ENV_FILE)