You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2016/01/25 20:53:20 UTC
[1/6] ambari git commit: AMBARI-14789. Spark Thrift Server component
does not start after EU from Dal M20 to Derg with umask 027 (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2.1 759f504ef -> 57f8f4fab
AMBARI-14789. Spark Thrift Server component does not start after EU from Dal M20 to Derg with umask 027 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/100b468c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/100b468c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/100b468c
Branch: refs/heads/branch-2.2.1
Commit: 100b468cbbece754c2062280e47a6639a8990743
Parents: 759f504
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Jan 25 18:02:14 2016 +0200
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Jan 25 14:51:35 2016 -0500
----------------------------------------------------------------------
.../SPARK/1.2.0.2.2/package/scripts/params.py | 1 +
.../SPARK/1.2.0.2.2/package/scripts/setup_spark.py | 12 ++++++++++--
.../stacks/2.2/SPARK/test_job_history_server.py | 14 ++++++++++++++
.../test/python/stacks/2.2/SPARK/test_spark_client.py | 14 ++++++++++++++
.../stacks/2.3/SPARK/test_spark_thrift_server.py | 7 +++++++
5 files changed, 46 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/100b468c/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index 2af47bf..a681a5c 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -89,6 +89,7 @@ spark_history_server_stop = format("{spark_home}/sbin/stop-history-server.sh")
spark_thrift_server_start = format("{spark_home}/sbin/start-thriftserver.sh")
spark_thrift_server_stop = format("{spark_home}/sbin/stop-thriftserver.sh")
+spark_logs_dir = format("{spark_home}/logs")
spark_submit_cmd = format("{spark_home}/bin/spark-submit")
spark_smoke_example = "org.apache.spark.examples.SparkPi"
http://git-wip-us.apache.org/repos/asf/ambari/blob/100b468c/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/setup_spark.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/setup_spark.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/setup_spark.py
index 4b66e39..6313558 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/setup_spark.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/setup_spark.py
@@ -58,14 +58,16 @@ def setup_spark(env, type, upgrade_type = None, action = None):
File(os.path.join(params.spark_conf, 'spark-env.sh'),
owner=params.spark_user,
group=params.spark_group,
- content=InlineTemplate(params.spark_env_sh)
+ content=InlineTemplate(params.spark_env_sh),
+ mode=0644,
)
#create log4j.properties in etc/conf dir
File(os.path.join(params.spark_conf, 'log4j.properties'),
owner=params.spark_user,
group=params.spark_group,
- content=params.spark_log4j_properties
+ content=params.spark_log4j_properties,
+ mode=0644,
)
#create metrics.properties in etc/conf dir
@@ -74,6 +76,12 @@ def setup_spark(env, type, upgrade_type = None, action = None):
group=params.spark_group,
content=InlineTemplate(params.spark_metrics_properties)
)
+
+ Directory(params.spark_logs_dir,
+ owner=params.spark_user,
+ group=params.spark_group,
+ mode=0755,
+ )
if params.is_hive_installed:
XmlConfig("hive-site.xml",
http://git-wip-us.apache.org/repos/asf/ambari/blob/100b468c/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
index 60c2fa9..acb604d 100644
--- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
+++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py
@@ -199,17 +199,24 @@ class TestJobHistoryServer(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['spark-env']['content']),
owner = 'spark',
group = 'spark',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/log4j.properties',
content = '\n# Set everything to be logged to the console\nlog4j.rootCategory=INFO, console\nlog4j.appender.console=org.apache.log4j.ConsoleAppender\nlog4j.appender.console.target=System.err\nlog4j.appender.console.layout=org.apache.log4j.PatternLayout\nlog4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n\n\n# Settings to quiet third party logs that are too verbose\nlog4j.logger.org.eclipse.jetty=WARN\nlog4j.logger.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR\nlog4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO\nlog4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO',
owner = 'spark',
group = 'spark',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/metrics.properties',
content = InlineTemplate(self.getConfig()['configurations']['spark-metrics-properties']['content']),
owner = 'spark',
group = 'spark',
)
+ self.assertResourceCalled('Directory', '/usr/hdp/current/spark-client/logs',
+ owner = 'spark',
+ group = 'spark',
+ mode = 0755,
+ )
def assert_configure_secured(self):
self.assertResourceCalled('Directory', '/var/run/spark',
@@ -261,17 +268,24 @@ class TestJobHistoryServer(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['spark-env']['content']),
owner = 'spark',
group = 'spark',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/log4j.properties',
content = '\n# Set everything to be logged to the console\nlog4j.rootCategory=INFO, console\nlog4j.appender.console=org.apache.log4j.ConsoleAppender\nlog4j.appender.console.target=System.err\nlog4j.appender.console.layout=org.apache.log4j.PatternLayout\nlog4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n\n\n# Settings to quiet third party logs that are too verbose\nlog4j.logger.org.eclipse.jetty=WARN\nlog4j.logger.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR\nlog4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO\nlog4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO',
owner = 'spark',
group = 'spark',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/metrics.properties',
content = InlineTemplate(self.getConfig()['configurations']['spark-metrics-properties']['content']),
owner = 'spark',
group = 'spark',
)
+ self.assertResourceCalled('Directory', '/usr/hdp/current/spark-client/logs',
+ owner = 'spark',
+ group = 'spark',
+ mode = 0755,
+ )
@patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs")
http://git-wip-us.apache.org/repos/asf/ambari/blob/100b468c/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py
index 702f3f1..633dbc7 100644
--- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py
+++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py
@@ -71,17 +71,24 @@ class TestSparkClient(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['spark-env']['content']),
owner = 'spark',
group = 'spark',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/log4j.properties',
content = '\n# Set everything to be logged to the console\nlog4j.rootCategory=INFO, console\nlog4j.appender.console=org.apache.log4j.ConsoleAppender\nlog4j.appender.console.target=System.err\nlog4j.appender.console.layout=org.apache.log4j.PatternLayout\nlog4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n\n\n# Settings to quiet third party logs that are too verbose\nlog4j.logger.org.eclipse.jetty=WARN\nlog4j.logger.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR\nlog4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO\nlog4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO',
owner = 'spark',
group = 'spark',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/metrics.properties',
content = InlineTemplate(self.getConfig()['configurations']['spark-metrics-properties']['content']),
owner = 'spark',
group = 'spark',
)
+ self.assertResourceCalled('Directory', '/usr/hdp/current/spark-client/logs',
+ owner = 'spark',
+ group = 'spark',
+ mode = 0755,
+ )
def assert_configure_secured(self):
@@ -107,17 +114,24 @@ class TestSparkClient(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['spark-env']['content']),
owner = 'spark',
group = 'spark',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/log4j.properties',
content = '\n# Set everything to be logged to the console\nlog4j.rootCategory=INFO, console\nlog4j.appender.console=org.apache.log4j.ConsoleAppender\nlog4j.appender.console.target=System.err\nlog4j.appender.console.layout=org.apache.log4j.PatternLayout\nlog4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n\n\n# Settings to quiet third party logs that are too verbose\nlog4j.logger.org.eclipse.jetty=WARN\nlog4j.logger.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR\nlog4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO\nlog4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO',
owner = 'spark',
group = 'spark',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/metrics.properties',
content = InlineTemplate(self.getConfig()['configurations']['spark-metrics-properties']['content']),
owner = 'spark',
group = 'spark',
)
+ self.assertResourceCalled('Directory', '/usr/hdp/current/spark-client/logs',
+ owner = 'spark',
+ group = 'spark',
+ mode = 0755,
+ )
def test_pre_upgrade_restart_23(self):
http://git-wip-us.apache.org/repos/asf/ambari/blob/100b468c/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
index c738245..4570190 100644
--- a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
@@ -127,17 +127,24 @@ class TestSparkThriftServer(RMFTestCase):
content = InlineTemplate(self.getConfig()['configurations']['spark-env']['content']),
owner = 'spark',
group = 'spark',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/log4j.properties',
content = '\n# Set everything to be logged to the console\nlog4j.rootCategory=INFO, console\nlog4j.appender.console=org.apache.log4j.ConsoleAppender\nlog4j.appender.console.target=System.err\nlog4j.appender.console.layout=org.apache.log4j.PatternLayout\nlog4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n\n\n# Settings to quiet third party logs that are too verbose\nlog4j.logger.org.eclipse.jetty=WARN\nlog4j.logger.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR\nlog4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO\nlog4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO',
owner = 'spark',
group = 'spark',
+ mode = 0644,
)
self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/metrics.properties',
content = InlineTemplate(self.getConfig()['configurations']['spark-metrics-properties']['content']),
owner = 'spark',
group = 'spark',
)
+ self.assertResourceCalled('Directory', '/usr/hdp/current/spark-client/logs',
+ owner = 'spark',
+ group = 'spark',
+ mode = 0755,
+ )
self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-thrift-sparkconf.conf',
key_value_delimiter = ' ',
owner = 'hive',
[6/6] ambari git commit: AMBARI-14774. Change logging level to INFO
for unit tests. Unstable unit tests fix. (mpapirkovskyy)
Posted by rl...@apache.org.
AMBARI-14774. Change logging level to INFO for unit tests. Unstable unit tests fix. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/57f8f4fa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/57f8f4fa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/57f8f4fa
Branch: refs/heads/branch-2.2.1
Commit: 57f8f4fab3b42d993b001d5c006795501201f39e
Parents: c6ece57
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Mon Jan 25 20:10:17 2016 +0200
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Jan 25 14:52:25 2016 -0500
----------------------------------------------------------------------
.../org/apache/ambari/server/actionmanager/ActionScheduler.java | 2 +-
.../apache/ambari/server/actionmanager/TestActionScheduler.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/57f8f4fa/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index 3b489e5..5753361 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -864,7 +864,7 @@ class ActionScheduler implements Runnable {
&& !status.equals(HostRoleStatus.IN_PROGRESS)) {
return false;
}
- if (currentTime > stage.getLastAttemptTime(hostName, role)
+ if (currentTime >= stage.getLastAttemptTime(hostName, role)
+ taskTimeout) {
return true;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/57f8f4fa/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
index fd8b4ea..bc4d397 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
@@ -317,7 +317,7 @@ public class TestActionScheduler {
stages.get(0).setHostRoleStatus(hostname, "SECONDARY_NAMENODE", HostRoleStatus.IN_PROGRESS);
scheduler.doWork();
assertEquals(1, stages.get(0).getAttemptCount(hostname, "NAMENODE"));
- assertEquals(1, stages.get(0).getAttemptCount(hostname, "SECONDARY_NAMENODE"));
+ assertEquals(2, stages.get(0).getAttemptCount(hostname, "SECONDARY_NAMENODE"));
while (!stages.get(0).getHostRoleStatus(hostname, "SECONDARY_NAMENODE")
.equals(HostRoleStatus.TIMEDOUT) && cycleCount++ <= MAX_CYCLE_ITERATIONS) {
[4/6] ambari git commit: AMBARI-14710. Add retry logic for REST calls
between Ambari and Ranger - Part 3 (gautam)
Posted by rl...@apache.org.
AMBARI-14710. Add retry logic for REST calls between Ambari and Ranger - Part 3 (gautam)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b21bebce
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b21bebce
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b21bebce
Branch: refs/heads/branch-2.2.1
Commit: b21bebce08868beb66d9227b762b4b99b203032b
Parents: 2fbfc3c
Author: Gautam Borad <ga...@apache.org>
Authored: Mon Jan 25 17:05:20 2016 +0530
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Jan 25 14:52:05 2016 -0500
----------------------------------------------------------------------
.../libraries/functions/ranger_functions.py | 27 +++++++-----------
.../libraries/functions/ranger_functions_v2.py | 30 +++++++-------------
2 files changed, 21 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b21bebce/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
index e302235..84a03a3 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
@@ -85,13 +85,11 @@ class Rangeradmin:
return None
except urllib2.URLError, e:
if isinstance(e, urllib2.HTTPError):
- Logger.error("Error getting {0} repository for component {1}. Http status code - {2}. \n {3}".format(name, component, e.code, e.read()))
+ raise Fail("Error getting {0} repository for component {1}. Http status code - {2}. \n {3}".format(name, component, e.code, e.read()))
else:
- Logger.error("Error getting {0} repository for component {1}. Reason - {2}.".format(name, component, e.reason))
- return None
+ raise Fail("Error getting {0} repository for component {1}. Reason - {2}.".format(name, component, e.reason))
except httplib.BadStatusLine:
- Logger.error("Ranger Admin service is not reachable, please restart the service and then try again")
- return None
+ raise Fail("Ranger Admin service is not reachable, please restart the service and then try again")
except TimeoutError:
raise Fail("Connection to Ranger Admin failed. Reason - timeout")
@@ -197,17 +195,15 @@ class Rangeradmin:
return None
except urllib2.URLError, e:
if isinstance(e, urllib2.HTTPError):
- Logger.error("Error creating repository. Http status code - {0}. \n {1}".format(e.code, e.read()))
+ raise Fail("Error creating repository. Http status code - {0}. \n {1}".format(e.code, e.read()))
else:
- Logger.error("Error creating repository. Reason - {0}.".format(e.reason))
- return None
+ raise Fail("Error creating repository. Reason - {0}.".format(e.reason))
except httplib.BadStatusLine:
- Logger.error("Ranger Admin service is not reachable, please restart the service and then try again")
- return None
+ raise Fail("Ranger Admin service is not reachable, please restart the service and then try again")
except TimeoutError:
raise Fail("Connection to Ranger Admin failed. Reason - timeout")
- @safe_retry(times=15, sleep_time=8, backoff_factor=1.5, err_class=Fail, return_on_fail=None)
+ @safe_retry(times=75, sleep_time=8, backoff_factor=1, err_class=Fail, return_on_fail=None)
def check_ranger_login_urllib2(self, url):
"""
:param url: ranger admin host url
@@ -390,13 +386,10 @@ class Rangeradmin:
return None
except urllib2.URLError, e:
if isinstance(e, urllib2.HTTPError):
- Logger.error("Error creating ambari admin user. Http status code - {0}. \n {1}".format(e.code, e.read()))
- return None
+ raise Fail("Error creating ambari admin user. Http status code - {0}. \n {1}".format(e.code, e.read()))
else:
- Logger.error("Error creating ambari admin user. Reason - {0}.".format(e.reason))
- return None
+ raise Fail("Error creating ambari admin user. Reason - {0}.".format(e.reason))
except httplib.BadStatusLine:
- Logger.error("Ranger Admin service is not reachable, please restart the service and then try again")
- return None
+ raise Fail("Ranger Admin service is not reachable, please restart the service and then try again")
except TimeoutError:
raise Fail("Connection to Ranger Admin failed. Reason - timeout")
http://git-wip-us.apache.org/repos/asf/ambari/blob/b21bebce/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
index 6624c89..3bb0103 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
@@ -84,13 +84,11 @@ class RangeradminV2:
return None
except urllib2.URLError, e:
if isinstance(e, urllib2.HTTPError):
- Logger.error("Error getting {0} repository for component {1}. Http status code - {2}. \n {3}".format(name, component, e.code, e.read()))
+ raise Fail("Error getting {0} repository for component {1}. Http status code - {2}. \n {3}".format(name, component, e.code, e.read()))
else:
- Logger.error("Error getting {0} repository for component {1}. Reason - {2}.".format(name, component, e.reason))
- return None
+ raise Fail("Error getting {0} repository for component {1}. Reason - {2}.".format(name, component, e.reason))
except httplib.BadStatusLine:
- Logger.error("Ranger Admin service is not reachable, please restart the service and then try again")
- return None
+ raise Fail("Ranger Admin service is not reachable, please restart the service and then try again")
except TimeoutError:
raise Fail("Connection to Ranger Admin failed. Reason - timeout")
@@ -156,21 +154,18 @@ class RangeradminV2:
Logger.info('Repository created Successfully')
return response
else:
- Logger.error('Repository creation failed')
- return None
+ raise Fail('Repository creation failed')
except urllib2.URLError, e:
if isinstance(e, urllib2.HTTPError):
- Logger.error("Error creating repository. Http status code - {0}. \n {1}".format(e.code, e.read()))
+ raise Fail("Error creating repository. Http status code - {0}. \n {1}".format(e.code, e.read()))
else:
- Logger.error("Error creating repository. Reason - {0}.".format(e.reason))
- return None
+ raise Fail("Error creating repository. Reason - {0}.".format(e.reason))
except httplib.BadStatusLine:
- Logger.error("Ranger Admin service is not reachable, please restart the service and then try again")
- return None
+ raise Fail("Ranger Admin service is not reachable, please restart the service and then try again")
except TimeoutError:
raise Fail("Connection to Ranger Admin failed. Reason - timeout")
- @safe_retry(times=15, sleep_time=8, backoff_factor=1.5, err_class=Fail, return_on_fail=None)
+ @safe_retry(times=75, sleep_time=8, backoff_factor=1, err_class=Fail, return_on_fail=None)
def check_ranger_login_urllib2(self, url):
"""
:param url: ranger admin host url
@@ -255,13 +250,10 @@ class RangeradminV2:
return None
except urllib2.URLError, e:
if isinstance(e, urllib2.HTTPError):
- Logger.error("Error creating ambari admin user. Http status code - {0}. \n {1}".format(e.code, e.read()))
- return None
+ raise Fail("Error creating ambari admin user. Http status code - {0}. \n {1}".format(e.code, e.read()))
else:
- Logger.error("Error creating ambari admin user. Reason - {0}.".format(e.reason))
- return None
+ raise Fail("Error creating ambari admin user. Reason - {0}.".format(e.reason))
except httplib.BadStatusLine:
- Logger.error("Ranger Admin service is not reachable, please restart the service and then try again")
- return None
+ raise Fail("Ranger Admin service is not reachable, please restart the service and then try again")
except TimeoutError:
raise Fail("Connection to Ranger Admin failed. Reason - timeout")
[3/6] ambari git commit: Revert "AMBARI-14745. Ambari server throws
error when unused configs are present in blueprint (Oliver Szabo via rlevas)"
Posted by rl...@apache.org.
Revert "AMBARI-14745. Ambari server throws error when unused configs are present in blueprint (Oliver Szabo via rlevas)"
This reverts commit da8afc426f8d0b59906e70f78d62626d84b1bc50.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2fbfc3c3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2fbfc3c3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2fbfc3c3
Branch: refs/heads/branch-2.2.1
Commit: 2fbfc3c3971881dd0b926bcb76523961e6f0b431
Parents: d37aab7
Author: Robert Levas <rl...@hortonworks.com>
Authored: Mon Jan 25 12:12:59 2016 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Jan 25 14:51:56 2016 -0500
----------------------------------------------------------------------
.../apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2fbfc3c3/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
index 21492cf..3d2685e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
@@ -556,7 +556,6 @@ public class AmbariLdapDataPopulator {
final LdapTemplate ldapTemplate = loadLdapTemplate();
PagedResultsDirContextProcessor processor = createPagingProcessor();
SearchControls searchControls = new SearchControls();
- searchControls.setReturningObjFlag(true);
searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
LdapUserContextMapper ldapUserContextMapper = new LdapUserContextMapper(ldapServerProperties);
String encodedFilter = filter.encode();
[2/6] ambari git commit: AMBARI-14745. Ambari server throws error
when unused configs are present in blueprint (Oliver Szabo via rlevas)
Posted by rl...@apache.org.
AMBARI-14745. Ambari server throws error when unused configs are present in blueprint (Oliver Szabo via rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d37aab7a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d37aab7a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d37aab7a
Branch: refs/heads/branch-2.2.1
Commit: d37aab7a1fe6f3643506be0026dc1d9c7f5743ae
Parents: 100b468
Author: Oliver Szabo <os...@hortonworks.com>
Authored: Mon Jan 25 12:08:50 2016 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Jan 25 14:51:48 2016 -0500
----------------------------------------------------------------------
.../apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d37aab7a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
index 3d2685e..21492cf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
@@ -556,6 +556,7 @@ public class AmbariLdapDataPopulator {
final LdapTemplate ldapTemplate = loadLdapTemplate();
PagedResultsDirContextProcessor processor = createPagingProcessor();
SearchControls searchControls = new SearchControls();
+ searchControls.setReturningObjFlag(true);
searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
LdapUserContextMapper ldapUserContextMapper = new LdapUserContextMapper(ldapServerProperties);
String encodedFilter = filter.encode();
[5/6] ambari git commit: AMBARI-14744. Ldap: unnecessary logging
during sync (Oliver Szabo via rlevas)
Posted by rl...@apache.org.
AMBARI-14744. Ldap: unnecessary logging during sync (Oliver Szabo via rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c6ece57e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c6ece57e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c6ece57e
Branch: refs/heads/branch-2.2.1
Commit: c6ece57eb95811cd7664e58297a6c2e4bf5811ae
Parents: b21bebc
Author: Oliver Szabo <os...@hortonworks.com>
Authored: Mon Jan 25 12:18:05 2016 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Jan 25 14:52:14 2016 -0500
----------------------------------------------------------------------
.../apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6ece57e/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
index 3d2685e..21492cf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
@@ -556,6 +556,7 @@ public class AmbariLdapDataPopulator {
final LdapTemplate ldapTemplate = loadLdapTemplate();
PagedResultsDirContextProcessor processor = createPagingProcessor();
SearchControls searchControls = new SearchControls();
+ searchControls.setReturningObjFlag(true);
searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
LdapUserContextMapper ldapUserContextMapper = new LdapUserContextMapper(ldapServerProperties);
String encodedFilter = filter.encode();