ambari git commit: AMBARI-9970. Metrics are absent for Storm. (mpapyrkovskyy via swagle)

2015-03-06 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 3f9ae9ef0 - 913c086a4


AMBARI-9970. Metrics are absent for Storm. (mpapyrkovskyy via swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/913c086a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/913c086a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/913c086a

Branch: refs/heads/branch-2.0.0
Commit: 913c086a4626b0925e1f7d7a104b46b5579d9b29
Parents: 3f9ae9e
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Fri Mar 6 20:01:23 2015 -0800
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Fri Mar 6 20:01:23 2015 -0800

--
 .../timeline/AbstractTimelineMetricsSink.java   | 26 ++--
 .../cache/HandleConnectExceptionTest.java   |  4 ---
 .../sink/flume/FlumeTimelineMetricsSink.java| 13 --
 .../timeline/HadoopTimelineMetricsSink.java |  7 --
 .../kafka/KafkaTimelineMetricsReporter.java | 15 ---
 .../storm/StormTimelineMetricsReporter.java | 21 +---
 .../sink/storm/StormTimelineMetricsSink.java| 17 -
 .../storm/StormTimelineMetricsSinkTest.java |  1 -
 8 files changed, 14 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/913c086a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
index 4f5c6a1..fd4cacd 100644
--- 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
@@ -19,10 +19,6 @@ package org.apache.hadoop.metrics2.sink.timeline;
 
 import java.io.IOException;
 import java.net.ConnectException;
-import java.net.SocketAddress;
-
-import java.io.IOException;
-import java.net.SocketAddress;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
@@ -63,19 +59,15 @@ public abstract class AbstractTimelineMetricsSink {
 try {
   String jsonData = mapper.writeValueAsString(metrics);
 
-  SocketAddress socketAddress = getServerSocketAddress();
+  StringRequestEntity requestEntity = new StringRequestEntity(jsonData, 
application/json, UTF-8);
 
-  if (socketAddress != null) {
-StringRequestEntity requestEntity = new StringRequestEntity(jsonData, 
application/json, UTF-8);
-
-PostMethod postMethod = new PostMethod(connectUrl);
-postMethod.setRequestEntity(requestEntity);
-int statusCode = httpClient.executeMethod(postMethod);
-if (statusCode != 200) {
-  LOG.info(Unable to POST metrics to collector,  + connectUrl);
-} else {
-  LOG.debug(Metrics posted to Collector  + connectUrl);
-}
+  PostMethod postMethod = new PostMethod(connectUrl);
+  postMethod.setRequestEntity(requestEntity);
+  int statusCode = httpClient.executeMethod(postMethod);
+  if (statusCode != 200) {
+LOG.info(Unable to POST metrics to collector,  + connectUrl);
+  } else {
+LOG.debug(Metrics posted to Collector  + connectUrl);
   }
 } catch (ConnectException e) {
   throw new UnableToConnectException(e).setConnectUrl(connectUrl);
@@ -86,7 +78,5 @@ public abstract class AbstractTimelineMetricsSink {
 this.httpClient = httpClient;
   }
 
-  abstract protected SocketAddress getServerSocketAddress();
-
   abstract protected String getCollectorUri();
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/913c086a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
 
b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
index 450906a..2786e3c 100644
--- 
a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
+++ 
b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
@@ -65,10 +65,6 @@ public class

ambari git commit: AMBARI-9970. Metrics are absent for Storm. (mpapyrkovskyy via swagle)

2015-03-06 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk ef262ecf2 - 61839b3dc


AMBARI-9970. Metrics are absent for Storm. (mpapyrkovskyy via swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61839b3d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61839b3d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61839b3d

Branch: refs/heads/trunk
Commit: 61839b3dcf543e2b07ac23b4ab5cbd3ef3bc6317
Parents: ef262ec
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Fri Mar 6 20:02:02 2015 -0800
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Fri Mar 6 20:02:02 2015 -0800

--
 .../timeline/AbstractTimelineMetricsSink.java   | 26 ++--
 .../cache/HandleConnectExceptionTest.java   |  4 ---
 .../sink/flume/FlumeTimelineMetricsSink.java| 13 --
 .../timeline/HadoopTimelineMetricsSink.java |  7 --
 .../kafka/KafkaTimelineMetricsReporter.java | 15 ---
 .../storm/StormTimelineMetricsReporter.java | 21 +---
 .../sink/storm/StormTimelineMetricsSink.java| 17 -
 .../storm/StormTimelineMetricsSinkTest.java |  1 -
 8 files changed, 14 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/61839b3d/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
 
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
index 4f5c6a1..fd4cacd 100644
--- 
a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
+++ 
b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java
@@ -19,10 +19,6 @@ package org.apache.hadoop.metrics2.sink.timeline;
 
 import java.io.IOException;
 import java.net.ConnectException;
-import java.net.SocketAddress;
-
-import java.io.IOException;
-import java.net.SocketAddress;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
@@ -63,19 +59,15 @@ public abstract class AbstractTimelineMetricsSink {
 try {
   String jsonData = mapper.writeValueAsString(metrics);
 
-  SocketAddress socketAddress = getServerSocketAddress();
+  StringRequestEntity requestEntity = new StringRequestEntity(jsonData, 
application/json, UTF-8);
 
-  if (socketAddress != null) {
-StringRequestEntity requestEntity = new StringRequestEntity(jsonData, 
application/json, UTF-8);
-
-PostMethod postMethod = new PostMethod(connectUrl);
-postMethod.setRequestEntity(requestEntity);
-int statusCode = httpClient.executeMethod(postMethod);
-if (statusCode != 200) {
-  LOG.info(Unable to POST metrics to collector,  + connectUrl);
-} else {
-  LOG.debug(Metrics posted to Collector  + connectUrl);
-}
+  PostMethod postMethod = new PostMethod(connectUrl);
+  postMethod.setRequestEntity(requestEntity);
+  int statusCode = httpClient.executeMethod(postMethod);
+  if (statusCode != 200) {
+LOG.info(Unable to POST metrics to collector,  + connectUrl);
+  } else {
+LOG.debug(Metrics posted to Collector  + connectUrl);
   }
 } catch (ConnectException e) {
   throw new UnableToConnectException(e).setConnectUrl(connectUrl);
@@ -86,7 +78,5 @@ public abstract class AbstractTimelineMetricsSink {
 this.httpClient = httpClient;
   }
 
-  abstract protected SocketAddress getServerSocketAddress();
-
   abstract protected String getCollectorUri();
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/61839b3d/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
--
diff --git 
a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
 
b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
index 450906a..2786e3c 100644
--- 
a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
+++ 
b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java
@@ -65,10 +65,6 @@ public class

[2/2] ambari git commit: AMBARI-9957. Can't start Oozie after changing database from default when UMASK=027 (dlysnichenko)

2015-03-06 Thread dmitriusan 
AMBARI-9957. Can't start Oozie after changing database from default when 
UMASK=027 (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f165b5cd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f165b5cd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f165b5cd

Branch: refs/heads/trunk
Commit: f165b5cd5182b7abddb4d8e57a2c5d5d392a37f6
Parents: 8edd3d3
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Mar 6 13:53:46 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Mar 6 13:55:15 2015 +0200

--
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py|   5 +
 .../stacks/2.0.6/OOZIE/test_oozie_server.py | 179 
 .../2.0.6/configs/default_oozie_mysql.json  | 820 +++
 3 files changed, 1004 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f165b5cd/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 29878fb..13026c3 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -168,6 +168,11 @@ def oozie_server_specific():
 #creates=params.target, TODO: uncomment after ranger_hive_plugin 
will not provide jdbc
 path=[/bin, /usr/bin/],
 sudo = True)
+
+File ( params.target,
+  owner = params.oozie_user,
+  group = params.user_group
+)
 
   #falcon el extension
   if params.has_falcon_host:

http://git-wip-us.apache.org/repos/asf/ambari/blob/f165b5cd/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py 
b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
index fda154f..8cd2f11 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
@@ -41,6 +41,185 @@ class TestOozieServer(RMFTestCase):
 self.assertNoMoreResources()
 
 
+  def test_configure_default_mysql(self):
+self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + 
/scripts/oozie_server.py,
+   classname = OozieServer,
+   command = configure,
+   config_file=default_oozie_mysql.json,
+   hdp_stack_version = self.STACK_VERSION,
+   target = RMFTestCase.TARGET_COMMON_SERVICES
+)
+self.assertResourceCalled('HdfsDirectory', '/user/oozie',
+  security_enabled = False,
+  keytab = UnknownConfigurationMock(),
+  conf_dir = '/etc/hadoop/conf',
+  hdfs_user = 'hdfs',
+  kinit_path_local = '/usr/bin/kinit',
+  mode = 0775,
+  owner = 'oozie',
+  bin_dir = '/usr/bin',
+  action = ['create'],
+  )
+self.assertResourceCalled('Directory', '/etc/oozie/conf',
+  owner = 'oozie',
+  group = 'hadoop',
+  recursive = True,
+  )
+self.assertResourceCalled('XmlConfig', 'oozie-site.xml',
+  group = 'hadoop',
+  conf_dir = '/etc/oozie/conf',
+  mode = 0664,
+  configuration_attributes = {u'final': 
{u'oozie.service.CallableQueueService.queue.size': u'true',
+ 
u'oozie.service.PurgeService.purge.interval': u'true'}},
+  owner = 'oozie',
+  configurations = 
self.getConfig()['configurations']['oozie-site'],
+  )
+self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
+  content = 
InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']),
+  owner = 'oozie',
+  )
+self.assertResourceCalled('File', '/etc/oozie/conf/oozie-log4j.properties',
+  content =

[1/2] ambari git commit: AMBARI-9957. Can't start Oozie after changing database from default when UMASK=027 (dlysnichenko)

2015-03-06 Thread dmitriusan 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 6ca2fc4c2 - 3432564fa
  refs/heads/trunk 8edd3d33e - f165b5cd5


AMBARI-9957. Can't start Oozie after changing database from default when 
UMASK=027 (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3432564f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3432564f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3432564f

Branch: refs/heads/branch-2.0.0
Commit: 3432564fa4551e242f0b826a31fcc1cb7efb842a
Parents: 6ca2fc4
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Mar 6 13:53:46 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Mar 6 13:55:08 2015 +0200

--
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py|   5 +
 .../stacks/2.0.6/OOZIE/test_oozie_server.py | 179 
 .../2.0.6/configs/default_oozie_mysql.json  | 820 +++
 3 files changed, 1004 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3432564f/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 29878fb..13026c3 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -168,6 +168,11 @@ def oozie_server_specific():
 #creates=params.target, TODO: uncomment after ranger_hive_plugin 
will not provide jdbc
 path=[/bin, /usr/bin/],
 sudo = True)
+
+File ( params.target,
+  owner = params.oozie_user,
+  group = params.user_group
+)
 
   #falcon el extension
   if params.has_falcon_host:

http://git-wip-us.apache.org/repos/asf/ambari/blob/3432564f/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py 
b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
index fda154f..8cd2f11 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
@@ -41,6 +41,185 @@ class TestOozieServer(RMFTestCase):
 self.assertNoMoreResources()
 
 
+  def test_configure_default_mysql(self):
+self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + 
/scripts/oozie_server.py,
+   classname = OozieServer,
+   command = configure,
+   config_file=default_oozie_mysql.json,
+   hdp_stack_version = self.STACK_VERSION,
+   target = RMFTestCase.TARGET_COMMON_SERVICES
+)
+self.assertResourceCalled('HdfsDirectory', '/user/oozie',
+  security_enabled = False,
+  keytab = UnknownConfigurationMock(),
+  conf_dir = '/etc/hadoop/conf',
+  hdfs_user = 'hdfs',
+  kinit_path_local = '/usr/bin/kinit',
+  mode = 0775,
+  owner = 'oozie',
+  bin_dir = '/usr/bin',
+  action = ['create'],
+  )
+self.assertResourceCalled('Directory', '/etc/oozie/conf',
+  owner = 'oozie',
+  group = 'hadoop',
+  recursive = True,
+  )
+self.assertResourceCalled('XmlConfig', 'oozie-site.xml',
+  group = 'hadoop',
+  conf_dir = '/etc/oozie/conf',
+  mode = 0664,
+  configuration_attributes = {u'final': 
{u'oozie.service.CallableQueueService.queue.size': u'true',
+ 
u'oozie.service.PurgeService.purge.interval': u'true'}},
+  owner = 'oozie',
+  configurations = 
self.getConfig()['configurations']['oozie-site'],
+  )
+self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh',
+  content = 
InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']),
+  owner = 'oozie',
+

[1/2] ambari git commit: AMBARI-9959 JS error after opening popup with hosts to add to config group. (ababiichuk)

2015-03-06 Thread ababiichuk 
Repository: ambari
Updated Branches:
  refs/heads/trunk f165b5cd5 - 31a497f45


AMBARI-9959 JS error after opening popup with hosts to add to config group. 
(ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6c949f4b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6c949f4b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6c949f4b

Branch: refs/heads/trunk
Commit: 6c949f4b52be096c1b98e01abb3ac448ca50055f
Parents: f165b5c
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Fri Mar 6 12:15:16 2015 +0200
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Fri Mar 6 14:02:14 2015 +0200

--
 ambari-web/app/views/common/table_view.js   |  2 +-
 ambari-web/test/views/common/table_view_test.js | 97 
 2 files changed, 98 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6c949f4b/ambari-web/app/views/common/table_view.js
--
diff --git a/ambari-web/app/views/common/table_view.js 
b/ambari-web/app/views/common/table_view.js
index 72c4bf7..5c51daf 100644
--- a/ambari-web/app/views/common/table_view.js
+++ b/ambari-web/app/views/common/table_view.js
@@ -455,7 +455,7 @@ App.TableView = Em.View.extend(App.UserPref, {
   });
   this.set('filteredContent', result);
 } else {
-  this.set('filteredContent', content.toArray());
+  this.set('filteredContent', content ? content.toArray() : []);
 }
   }.observes('content.length'),
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6c949f4b/ambari-web/test/views/common/table_view_test.js
--
diff --git a/ambari-web/test/views/common/table_view_test.js 
b/ambari-web/test/views/common/table_view_test.js
index c311834..76800a6 100644
--- a/ambari-web/test/views/common/table_view_test.js
+++ b/ambari-web/test/views/common/table_view_test.js
@@ -286,4 +286,101 @@ describe('App.TableView', function () {
 });
   });
 
+  describe('#filter', function () {
+
+var cases = [
+  {
+filterConditions: [
+  {
+iColumn: 1,
+type: 'string',
+value: 'v0'
+  }
+],
+content: [
+  Em.Object.create({
+c0: 'v0'
+  }),
+  Em.Object.create({
+c1: 'v1'
+  })
+],
+filteredContent: [],
+title: 'no matches'
+  },
+  {
+filterConditions: [
+  {
+iColumn: 0,
+type: 'string',
+value: 'v1'
+  }
+],
+content: [
+  Em.Object.create({
+c0: 'v1'
+  }),
+  Em.Object.create({
+c0: 'v11'
+  }),
+  Em.Object.create({
+c1: 'v01'
+  })
+],
+filteredContent: [
+  Em.Object.create({
+c0: 'v1'
+  }),
+  Em.Object.create({
+c0: 'v11'
+  })
+],
+title: 'matches present'
+  },
+  {
+filterConditions: [],
+content: [
+  Em.Object.create({
+c0: 'v0'
+  }),
+  Em.Object.create({
+c1: 'v1'
+  })
+],
+filteredContent: [
+  Em.Object.create({
+c0: 'v0'
+  }),
+  Em.Object.create({
+c1: 'v1'
+  })
+],
+title: 'no filter conditions'
+  },
+  {
+filterConditions: [],
+filteredContent: [],
+title: 'no filter conditions, no content'
+  }
+];
+
+beforeEach(function () {
+  view = App.TableView.create({
+colPropAssoc: ['c0', 'c1']
+  });
+});
+
+cases.forEach(function (item) {
+  it(item.title, function () {
+view.setProperties({
+  filterConditions: item.filterConditions,
+  content: item.content
+});
+view.filter();
+expect(view.get('filteredContent')).to.eql(item.filteredContent);
+  });
+});
+
+  });
+
 });

[2/2] ambari git commit: AMBARI-9951. hadooplzo_2_2_2_0_2538-native can not be upgraded during RU (dlysnichenko)

2015-03-06 Thread dmitriusan 
AMBARI-9951. hadooplzo_2_2_2_0_2538-native can not be upgraded during RU 
(dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8ce17b99
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8ce17b99
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8ce17b99

Branch: refs/heads/branch-2.0.0
Commit: 8ce17b991e7bdaba82622efbfb2b0fc888618707
Parents: 1956e0c
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Mar 6 11:57:59 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Mar 6 12:03:20 2015 +0200

--
 .../custom_actions/scripts/install_packages.py  | 18 +++-
 .../custom_actions/TestInstallPackages.py   | 91 
 .../configs/install_packages_config.json|  4 +-
 3 files changed, 91 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8ce17b99/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
--
diff --git 
a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py 
b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
index 5819390..eb93e18 100644
--- 
a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
+++ 
b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
@@ -29,6 +29,7 @@ from 
resource_management.libraries.functions.list_ambari_managed_repos import li
 from ambari_commons.os_check import OSCheck, OSConst
 from resource_management.libraries.functions.packages_analyzer import 
allInstalledPackages
 from resource_management.core.shell import call
+from resource_management.libraries.functions.default import default
 
 
 class InstallPackages(Script):
@@ -204,13 +205,24 @@ class InstallPackages(Script):
 
 filtered_package_list = []
 for package in package_list:
+  skip_package = False
   # mysql* package logic is managed at HIVE scripts
   if package['name'].startswith('mysql'):
-continue
+skip_package = True
   # Ambari metrics packages should not be upgraded during RU
   if package['name'].startswith('ambari-metrics'):
-continue
-  filtered_package_list.append(package)
+skip_package = True
+  # hadooplzo package is installed only if LZO comperession is enabled
+  io_compression_codecs = 
default(/configurations/core-site/io.compression.codecs, None)
+  if not io_compression_codecs or com.hadoop.compression.lzo not in 
io_compression_codecs:
+lzo_packages = ['hadoop-lzo', 'lzo', 'hadoop-lzo-native', 'liblzo2-2', 
'hadooplzo']
+for lzo_package in lzo_packages:
+  if package['name'].startswith(lzo_package):
+skip_package = True
+break
+
+  if not skip_package:
+filtered_package_list.append(package)
 return filtered_package_list
 
 if __name__ == __main__:

http://git-wip-us.apache.org/repos/asf/ambari/blob/8ce17b99/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
--
diff --git 
a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py 
b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
index 4975757..d2c340b 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -63,7 +63,7 @@ class TestInstallPackages(RMFTestCase):
'stack_id': 'HDP-2.2',
'ambari_repositories': []})
 self.assertResourceCalled('Repository', 'HDP-UTILS-2.2.0.1-885',
-  
base_url=u'http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0',
+  
base_url=u'http://repo1/HDP/centos5/2.x/updates/2.2.0.0',
   action=['create'],
   components=[u'HDP-UTILS', 'main'],
   repo_template='repo_suse_rhel.j2',
@@ -72,7 +72,7 @@ class TestInstallPackages(RMFTestCase):
   append_to_file=False,
 )
 self.assertResourceCalled('Repository', 'HDP-2.2.0.1-885',
-  
base_url=u'http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0',
+  
base_url=u'http://repo1/HDP/centos5/2.x/updates/2.2.0.0',
   action=['create'],
   components=[u'HDP', 'main'],
   repo_template='repo_suse_rhel.j2',
@@ -83,8 +83,6 @@ class TestInstallPackages(RMFTestCase):
 self.assertResourceCalled('Package',

[1/2] ambari git commit: AMBARI-9958. Hive (Hive metastore start...) start failed (umask=027) (aonishuk)

2015-03-06 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 cec514a6a - 6ca2fc4c2
  refs/heads/trunk 4bfde4351 - 8edd3d33e


AMBARI-9958. Hive (Hive metastore start...) start failed (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/8edd3d33
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8edd3d33
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8edd3d33

Branch: refs/heads/trunk
Commit: 8edd3d33e69dcb948f26841739a1d72abfca920a
Parents: 4bfde43
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Mar 6 13:54:18 2015 +0200
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Mar 6 13:54:18 2015 +0200

--
 ambari-agent/conf/unix/install-helper.sh | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8edd3d33/ambari-agent/conf/unix/install-helper.sh
--
diff --git a/ambari-agent/conf/unix/install-helper.sh 
b/ambari-agent/conf/unix/install-helper.sh
index e0c348c..75acab7 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -56,6 +56,12 @@ do_install(){
   if [ $? -ne 0 ] ; then
 echo '#includedir /etc/sudoers.d'  /etc/sudoers
   fi
+  
+  # on nano Ubuntu, when umask=027 those folders are created without 'x' bit 
for 'others'.
+  # which causes failures when hadoop users try to access tmp_dir
+  chmod a+x /var/lib/ambari-agent
+  chmod a+x /var/lib/ambari-agent/data
+  chmod a+x /var/lib/ambari-agent/data/tmp
 }
 
 do_remove(){

[2/2] ambari git commit: AMBARI-9958. Hive (Hive metastore start...) start failed (umask=027) (aonishuk)

2015-03-06 Thread aonishuk 
AMBARI-9958. Hive (Hive metastore start...) start failed (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/6ca2fc4c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ca2fc4c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ca2fc4c

Branch: refs/heads/branch-2.0.0
Commit: 6ca2fc4c2dc0dc883a87d33428cb7ff1570a26c7
Parents: cec514a
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Mar 6 13:54:20 2015 +0200
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Mar 6 13:54:20 2015 +0200

--
 ambari-agent/conf/unix/install-helper.sh | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ca2fc4c/ambari-agent/conf/unix/install-helper.sh
--
diff --git a/ambari-agent/conf/unix/install-helper.sh 
b/ambari-agent/conf/unix/install-helper.sh
index e0c348c..75acab7 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -56,6 +56,12 @@ do_install(){
   if [ $? -ne 0 ] ; then
 echo '#includedir /etc/sudoers.d'  /etc/sudoers
   fi
+  
+  # on nano Ubuntu, when umask=027 those folders are created without 'x' bit 
for 'others'.
+  # which causes failures when hadoop users try to access tmp_dir
+  chmod a+x /var/lib/ambari-agent
+  chmod a+x /var/lib/ambari-agent/data
+  chmod a+x /var/lib/ambari-agent/data/tmp
 }
 
 do_remove(){

[1/2] ambari git commit: AMBARI-9953 Ambari Metrics monitor restart failed with error JAVA_HOME is not set

2015-03-06 Thread fbarca 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 3432564fa - d6b0fff63
  refs/heads/trunk 31a497f45 - ee6754a72


AMBARI-9953 Ambari Metrics monitor restart failed with error JAVA_HOME is not 
set

Ensure config() gets called on restart(), when this one is invoked before 
start().


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ee6754a7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ee6754a7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ee6754a7

Branch: refs/heads/trunk
Commit: ee6754a7258e6ed43df8bda86506cceaba410989
Parents: 31a497f
Author: Florian Barca fba...@hortonworks.com
Authored: Fri Mar 6 09:24:11 2015 -0800
Committer: Florian Barca fba...@hortonworks.com
Committed: Fri Mar 6 09:24:11 2015 -0800

--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ee6754a7/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
index a5cb74c..6ffe0e6 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
@@ -51,6 +51,9 @@ class AmsCollector(Script):
 import params
 env.set_params(params)
 
+# Sometimes, stop() may be called before start(), in case restart() is 
initiated right after installation
+self.configure(env) # for security
+
 ams_service( 'collector', action = 'stop')
 
   def status(self, env):

ambari git commit: AMBARI-9956 RU: display repository name in versionbox. (ababiichuk)

2015-03-06 Thread ababiichuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 8ce17b991 - cec514a6a


AMBARI-9956 RU: display repository name in versionbox. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cec514a6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cec514a6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cec514a6

Branch: refs/heads/branch-2.0.0
Commit: cec514a6a8555d6ac6a5eac0317ca0df71d7a203
Parents: 8ce17b9
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Fri Mar 6 12:15:16 2015 +0200
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Fri Mar 6 12:15:16 2015 +0200

--
 ambari-web/app/styles/stack_versions.less   | 12 ++--
 .../main/admin/stack_upgrade/upgrade_version_box.hbs|  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cec514a6/ambari-web/app/styles/stack_versions.less
--
diff --git a/ambari-web/app/styles/stack_versions.less 
b/ambari-web/app/styles/stack_versions.less
index 6fd2954..7749517 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -173,7 +173,7 @@
   }
 }
 .installing {
-  margin-top: 0;
+  margin-top: 11px;
   padding-top: 0;
   padding-bottom: 10px;
   .progress {
@@ -194,6 +194,7 @@
   font-size: 20px;
   line-height: 20px;
   padding: 5px 5px 0px 5px;
+  margin-bottom: 0px;
   span {
 margin-left: 20px;
   }
@@ -203,8 +204,15 @@
 line-height: 20px;
   }
 }
+.repository-name {
+  text-align: center;
+  color: #888;
+  font-size: 12px;
+  margin: 0px 0px -17px 0px;
+  padding: 0px;
+}
 .hosts-section {
-  margin-top: 20px;
+  margin-top: 16px;
   width: 100%;
   text-align: center;
   background: #f8f8f8;

http://git-wip-us.apache.org/repos/asf/ambari/blob/cec514a6/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
--
diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
index 138568f..f3f64f2 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
@@ -26,6 +26,7 @@
 i class=icon-edit/i
   /a
 /p
+p class=repository-name({{view.content.repositoryVersion}})/p
 div {{bindAttr class=view.stateElement.isInstalling:installing :align-center 
:state}}
   {{#if view.stateElement.isButton}}
 button class=btn btn-primary

[1/2] ambari git commit: AMBARI-9951. hadooplzo_2_2_2_0_2538-native can not be upgraded during RU (dlysnichenko)

2015-03-06 Thread dmitriusan 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 1956e0cd6 - 8ce17b991
  refs/heads/trunk 9c14b8f66 - b5ef4a1bc


AMBARI-9951. hadooplzo_2_2_2_0_2538-native can not be upgraded during RU 
(dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b5ef4a1b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b5ef4a1b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b5ef4a1b

Branch: refs/heads/trunk
Commit: b5ef4a1bc2052b628b20d4ac85976e6e12517663
Parents: 9c14b8f
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Mar 6 11:57:59 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Mar 6 11:57:59 2015 +0200

--
 .../custom_actions/scripts/install_packages.py  | 18 +++-
 .../custom_actions/TestInstallPackages.py   | 91 
 .../configs/install_packages_config.json|  4 +-
 3 files changed, 91 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ef4a1b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
--
diff --git 
a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py 
b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
index 5819390..eb93e18 100644
--- 
a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
+++ 
b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
@@ -29,6 +29,7 @@ from 
resource_management.libraries.functions.list_ambari_managed_repos import li
 from ambari_commons.os_check import OSCheck, OSConst
 from resource_management.libraries.functions.packages_analyzer import 
allInstalledPackages
 from resource_management.core.shell import call
+from resource_management.libraries.functions.default import default
 
 
 class InstallPackages(Script):
@@ -204,13 +205,24 @@ class InstallPackages(Script):
 
 filtered_package_list = []
 for package in package_list:
+  skip_package = False
   # mysql* package logic is managed at HIVE scripts
   if package['name'].startswith('mysql'):
-continue
+skip_package = True
   # Ambari metrics packages should not be upgraded during RU
   if package['name'].startswith('ambari-metrics'):
-continue
-  filtered_package_list.append(package)
+skip_package = True
+  # hadooplzo package is installed only if LZO comperession is enabled
+  io_compression_codecs = 
default(/configurations/core-site/io.compression.codecs, None)
+  if not io_compression_codecs or com.hadoop.compression.lzo not in 
io_compression_codecs:
+lzo_packages = ['hadoop-lzo', 'lzo', 'hadoop-lzo-native', 'liblzo2-2', 
'hadooplzo']
+for lzo_package in lzo_packages:
+  if package['name'].startswith(lzo_package):
+skip_package = True
+break
+
+  if not skip_package:
+filtered_package_list.append(package)
 return filtered_package_list
 
 if __name__ == __main__:

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ef4a1b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
--
diff --git 
a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py 
b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
index 4975757..d2c340b 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -63,7 +63,7 @@ class TestInstallPackages(RMFTestCase):
'stack_id': 'HDP-2.2',
'ambari_repositories': []})
 self.assertResourceCalled('Repository', 'HDP-UTILS-2.2.0.1-885',
-  
base_url=u'http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0',
+  
base_url=u'http://repo1/HDP/centos5/2.x/updates/2.2.0.0',
   action=['create'],
   components=[u'HDP-UTILS', 'main'],
   repo_template='repo_suse_rhel.j2',
@@ -72,7 +72,7 @@ class TestInstallPackages(RMFTestCase):
   append_to_file=False,
 )
 self.assertResourceCalled('Repository', 'HDP-2.2.0.1-885',
-  
base_url=u'http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0',
+  
base_url=u'http://repo1/HDP/centos5/2.x/updates/2.2.0.0',
   action=['create'],
   components=[u'HDP', 'main'],

ambari git commit: AMBARI-9952. Populate spark keytab to both spark_history_server and spark_client (Zhan Zhang via smohanty)

2015-03-06 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk ee6754a72 - 813973a05


AMBARI-9952. Populate spark keytab to both spark_history_server and 
spark_client (Zhan Zhang via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/813973a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/813973a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/813973a0

Branch: refs/heads/trunk
Commit: 813973a051329b721b3f60cbd836ec58f631f4fb
Parents: ee6754a
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Fri Mar 6 09:51:04 2015 -0800
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Fri Mar 6 09:51:04 2015 -0800

--
 .../SPARK/1.2.0.2.2/kerberos.json   | 52 +++-
 1 file changed, 28 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/813973a0/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
index 499d0dd..9a707dc 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
@@ -5,34 +5,38 @@
   identities: [
 {
   name: /smokeuser
+},
+{
+  name: /hdfs
+},
+{
+  name: sparkuser,
+  principal: {
+value: ${spark-env/spark_user}@${realm},
+type : user,
+configuration: spark-defaults/spark.history.kerberos.principal,
+local_username : ${spark-env/spark_user}
+  },
+  keytab: {
+file: ${keytab_dir}/spark.headless.keytab,
+owner: {
+  name: ${spark-env/spark_user},
+  access: r
+},
+group: {
+  name: ${cluster-env/user_group},
+   access: 
+},
+configuration: spark-defaults/spark.history.kerberos.keytab
+   }
 }
   ],
   components: [
 {
-  name: SPARK_JOBHISTORYSERVER,
-  identities: [
-{
-  name: spark_historyserver,
-  principal: {
-value: spark/_HOST@${realm},
-type : service,
-configuration: 
spark-defaults/spark.history.kerberos.principal,
-local_username : ${spark-env/spark_user}
-  },
-  keytab: {
-file: ${keytab_dir}/spark.service.keytab,
-owner: {
-  name: ${spark-env/spark_user},
-  access: r
-},
-group: {
-  name: ${cluster-env/user_group},
-  access: 
-},
-configuration: spark-defaults/spark.history.kerberos.keytab
-  }
-}
-  ]
+  name: SPARK_JOBHISTORYSERVER
+},
+{
+  name: SPARK_CLIENT
 }
   ]
 }

ambari git commit: AMBARI-9955: Ambari-Server and Ambari-Agent fail to start on Windows (jluniya)

2015-03-06 Thread jluniya 
Repository: ambari
Updated Branches:
  refs/heads/trunk 813973a05 - 4894eabd5


AMBARI-9955: Ambari-Server and Ambari-Agent fail to start on Windows (jluniya)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4894eabd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4894eabd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4894eabd

Branch: refs/heads/trunk
Commit: 4894eabd5d05e585b563aa4e2e5c055418e404a1
Parents: 813973a
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Fri Mar 6 10:09:20 2015 -0800
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Fri Mar 6 10:09:20 2015 -0800

--
 .../org/apache/ambari/server/configuration/Configuration.java| 2 ++
 .../common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py   | 4 
 .../apache/ambari/server/configuration/ConfigurationTest.java| 3 +++
 3 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4894eabd/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 c5595e6..1129265 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
@@ -1343,6 +1343,8 @@ public class Configuration {
   databaseType = DatabaseType.MYSQL;
 } else if (dbUrl.contains(DatabaseType.DERBY.getName())) {
   databaseType = DatabaseType.DERBY;
+} else if (dbUrl.contains(DatabaseType.SQL_SERVER.getName())) {
+  databaseType = DatabaseType.SQL_SERVER;
 } else {
   throw new RuntimeException(
   The database type could be not determined from the JDBC URL 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4894eabd/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
index bc10adf..57523a5 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
@@ -183,6 +183,10 @@ class NameNode(Script):
 threshold = name_node_parameters['threshold']
 _print(Starting balancer with threshold = %s\n % threshold)
 
+if params.security_enabled:
+  Execute(format({kinit_path_local} -kt {hdfs_user_keytab} 
{hdfs_principal_name}),
+  user = params.hdfs_user)
+
 def calculateCompletePercent(first, current):
   return 1.0 - current.bytesLeftToMove/first.bytesLeftToMove
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4894eabd/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
index ced3087..63447ca 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
@@ -437,5 +437,8 @@ public class ConfigurationTest {
 
 ambariProperties.setProperty(Configuration.SERVER_JDBC_URL_KEY, 
jdbc:derby://server);
 Assert.assertEquals( DatabaseType.DERBY, configuration.getDatabaseType() );
+
+ambariProperties.setProperty(Configuration.SERVER_JDBC_URL_KEY, 
jdbc:sqlserver://server);
+Assert.assertEquals( DatabaseType.SQL_SERVER, 
configuration.getDatabaseType() );
   }
 }

[3/6] ambari git commit: AMBARI-9962. HostCleanup.py does not remove packages (dlysnichenko)

2015-03-06 Thread dmitriusan 
AMBARI-9962. HostCleanup.py does not remove packages (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/844687f0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/844687f0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/844687f0

Branch: refs/heads/trunk
Commit: 844687f0c81104403226c55af356edcf43532aa5
Parents: 8775d88
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Mar 6 20:54:21 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Mar 6 20:55:39 2015 +0200

--
 ambari-agent/src/main/python/ambari_agent/HostCleanup.py   | 2 +-
 .../src/test/python/resource_management/TestUserResource.py| 2 +-
 ambari-common/src/main/python/ambari_commons/constants.py  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/844687f0/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py 
b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
index 3e7e83f..ca9bc41 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
@@ -477,7 +477,7 @@ class HostCleanup:
   # Run command as sudoer by default, if root no issues
   def run_os_command(self, cmd, runWithSudo=True):
 if runWithSudo:
-  cmd = AMBARI_SUDO_BINARY + cmd
+  cmd = /var/lib/ambari-agent/+AMBARI_SUDO_BINARY +   + cmd
 logger.info('Executing command: ' + str(cmd))
 if type(cmd) == str:
   cmd = shlex.split(cmd)

http://git-wip-us.apache.org/repos/asf/ambari/blob/844687f0/ambari-agent/src/test/python/resource_management/TestUserResource.py
--
diff --git 
a/ambari-agent/src/test/python/resource_management/TestUserResource.py 
b/ambari-agent/src/test/python/resource_management/TestUserResource.py
index c757361..3062881 100644
--- a/ambari-agent/src/test/python/resource_management/TestUserResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestUserResource.py
@@ -183,7 +183,7 @@ class TestUserResource(TestCase):
   user = User(mapred, action = create, groups = ['1','2','3'], 
   shell = /bin/bash)
 
-popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', 
'-c', ambari-sudo.sh  PATH=/bin -H -E usermod -G 1,2,3 -s /bin/bash mapred], 
shell=False, preexec_fn=None, stderr=-2, stdout=5, bufsize=1, env={'PATH': 
'/bin'}, cwd=None)
+popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', 
'-c', 'ambari-sudo.sh  PATH=/bin -H -E usermod -G 1,2,3,hadoop -s /bin/bash 
mapred'], shell=False, preexec_fn=None, stderr=-2, stdout=5, env={'PATH': 
'/bin'}, bufsize=1, cwd=None)
 self.assertEqual(popen_mock.call_count, 1)
 
   @patch.object(subprocess, Popen)

http://git-wip-us.apache.org/repos/asf/ambari/blob/844687f0/ambari-common/src/main/python/ambari_commons/constants.py
--
diff --git a/ambari-common/src/main/python/ambari_commons/constants.py 
b/ambari-common/src/main/python/ambari_commons/constants.py
index b823b31..99ff679 100644
--- a/ambari-common/src/main/python/ambari_commons/constants.py
+++ b/ambari-common/src/main/python/ambari_commons/constants.py
@@ -18,4 +18,4 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 '''
 
-AMBARI_SUDO_BINARY = ambari-sudo.sh
\ No newline at end of file
+AMBARI_SUDO_BINARY = ambari-sudo.sh

[6/6] ambari git commit: AMBARI-9961. Checkpoint creation failed when enabling HA (dlysnichenko)

2015-03-06 Thread dmitriusan 
AMBARI-9961. Checkpoint creation failed when enabling HA (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d9dc9e39
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d9dc9e39
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d9dc9e39

Branch: refs/heads/branch-2.0.0
Commit: d9dc9e3936f5226fd309eccd659bc41f08cb55b5
Parents: 71096fe
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Mar 6 20:55:14 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Mar 6 20:56:45 2015 +0200

--
 .../2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py  | 4 ++--
 .../stacks/2.0.6/hooks/before-INSTALL/test_before_install.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9dc9e39/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
index 0d64644..8adc550 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -45,10 +45,10 @@ def setup_java():
 
   if params.jdk_name.endswith(.bin):
 chmod_cmd = (chmod, +x, jdk_curl_target)
-install_cmd = format(mkdir -p {tmp_java_dir}  cd {tmp_java_dir}  echo 
A | {jdk_curl_target} -noregister  {sudo} cp -r {tmp_java_dir}/* {java_dir})
+install_cmd = format(mkdir -p {tmp_java_dir}  cd {tmp_java_dir}  echo 
A | {jdk_curl_target} -noregister  {sudo} cp -rp {tmp_java_dir}/* {java_dir})
   elif params.jdk_name.endswith(.gz):
 chmod_cmd = (chmod,a+x, java_dir)
-install_cmd = format(mkdir -p {tmp_java_dir}  cd {tmp_java_dir}  tar 
-xf {jdk_curl_target}  {sudo} cp -r {tmp_java_dir}/* {java_dir})
+install_cmd = format(mkdir -p {tmp_java_dir}  cd {tmp_java_dir}  tar 
-xf {jdk_curl_target}  {sudo} cp -rp {tmp_java_dir}/* {java_dir})
 
   Directory(java_dir
   )

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9dc9e39/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
index 1304eef..3c89fb3 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
@@ -53,7 +53,7 @@ class TestHookBeforeInstall(RMFTestCase):
 not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java',
 sudo = True,
 )
-self.assertResourceCalled('Execute', 'mkdir -p /tmp/jdk  cd /tmp/jdk  
tar -xf /tmp/AMBARI-artifacts//jdk-7u67-linux-x64.tar.gz  ambari-sudo.sh cp 
-r /tmp/jdk/* /usr/jdk64',
+self.assertResourceCalled('Execute', 'mkdir -p /tmp/jdk  cd /tmp/jdk  
tar -xf /tmp/AMBARI-artifacts//jdk-7u67-linux-x64.tar.gz  ambari-sudo.sh cp 
-rp /tmp/jdk/* /usr/jdk64',
 not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java',
 )
 self.assertResourceCalled('Execute', ('chgrp', '-R', u'hadoop', 
u'/usr/jdk64/jdk1.7.0_45'),

ambari git commit: AMBARI-9952. Populate spark keytab to both spark_history_server and spark_client (Zhan Zhang via smohanty)

2015-03-06 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 d6b0fff63 - 2d80c07bd


AMBARI-9952. Populate spark keytab to both spark_history_server and 
spark_client (Zhan Zhang via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2d80c07b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2d80c07b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2d80c07b

Branch: refs/heads/branch-2.0.0
Commit: 2d80c07bd7cdb164c5b8a5de3c236904bc8937d9
Parents: d6b0fff
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Fri Mar 6 09:51:04 2015 -0800
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Fri Mar 6 09:51:57 2015 -0800

--
 .../SPARK/1.2.0.2.2/kerberos.json   | 52 +++-
 1 file changed, 28 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2d80c07b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
index 499d0dd..9a707dc 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
@@ -5,34 +5,38 @@
   identities: [
 {
   name: /smokeuser
+},
+{
+  name: /hdfs
+},
+{
+  name: sparkuser,
+  principal: {
+value: ${spark-env/spark_user}@${realm},
+type : user,
+configuration: spark-defaults/spark.history.kerberos.principal,
+local_username : ${spark-env/spark_user}
+  },
+  keytab: {
+file: ${keytab_dir}/spark.headless.keytab,
+owner: {
+  name: ${spark-env/spark_user},
+  access: r
+},
+group: {
+  name: ${cluster-env/user_group},
+   access: 
+},
+configuration: spark-defaults/spark.history.kerberos.keytab
+   }
 }
   ],
   components: [
 {
-  name: SPARK_JOBHISTORYSERVER,
-  identities: [
-{
-  name: spark_historyserver,
-  principal: {
-value: spark/_HOST@${realm},
-type : service,
-configuration: 
spark-defaults/spark.history.kerberos.principal,
-local_username : ${spark-env/spark_user}
-  },
-  keytab: {
-file: ${keytab_dir}/spark.service.keytab,
-owner: {
-  name: ${spark-env/spark_user},
-  access: r
-},
-group: {
-  name: ${cluster-env/user_group},
-  access: 
-},
-configuration: spark-defaults/spark.history.kerberos.keytab
-  }
-}
-  ]
+  name: SPARK_JOBHISTORYSERVER
+},
+{
+  name: SPARK_CLIENT
 }
   ]
 }

[1/6] ambari git commit: AMBARI-9961. Checkpoint creation failed when enabling HA (dlysnichenko)

2015-03-06 Thread dmitriusan 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 2d80c07bd - d9dc9e393
  refs/heads/trunk 4894eabd5 - 6576da657


AMBARI-9961. Checkpoint creation failed when enabling HA (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6576da65
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6576da65
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6576da65

Branch: refs/heads/trunk
Commit: 6576da65722ae1c7fd6ee3a006f71b1248b68447
Parents: 844687f
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Mar 6 20:55:14 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Mar 6 20:55:39 2015 +0200

--
 .../2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py  | 4 ++--
 .../stacks/2.0.6/hooks/before-INSTALL/test_before_install.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6576da65/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
index 0d64644..8adc550 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -45,10 +45,10 @@ def setup_java():
 
   if params.jdk_name.endswith(.bin):
 chmod_cmd = (chmod, +x, jdk_curl_target)
-install_cmd = format(mkdir -p {tmp_java_dir}  cd {tmp_java_dir}  echo 
A | {jdk_curl_target} -noregister  {sudo} cp -r {tmp_java_dir}/* {java_dir})
+install_cmd = format(mkdir -p {tmp_java_dir}  cd {tmp_java_dir}  echo 
A | {jdk_curl_target} -noregister  {sudo} cp -rp {tmp_java_dir}/* {java_dir})
   elif params.jdk_name.endswith(.gz):
 chmod_cmd = (chmod,a+x, java_dir)
-install_cmd = format(mkdir -p {tmp_java_dir}  cd {tmp_java_dir}  tar 
-xf {jdk_curl_target}  {sudo} cp -r {tmp_java_dir}/* {java_dir})
+install_cmd = format(mkdir -p {tmp_java_dir}  cd {tmp_java_dir}  tar 
-xf {jdk_curl_target}  {sudo} cp -rp {tmp_java_dir}/* {java_dir})
 
   Directory(java_dir
   )

http://git-wip-us.apache.org/repos/asf/ambari/blob/6576da65/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
index 1304eef..3c89fb3 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
@@ -53,7 +53,7 @@ class TestHookBeforeInstall(RMFTestCase):
 not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java',
 sudo = True,
 )
-self.assertResourceCalled('Execute', 'mkdir -p /tmp/jdk  cd /tmp/jdk  
tar -xf /tmp/AMBARI-artifacts//jdk-7u67-linux-x64.tar.gz  ambari-sudo.sh cp 
-r /tmp/jdk/* /usr/jdk64',
+self.assertResourceCalled('Execute', 'mkdir -p /tmp/jdk  cd /tmp/jdk  
tar -xf /tmp/AMBARI-artifacts//jdk-7u67-linux-x64.tar.gz  ambari-sudo.sh cp 
-rp /tmp/jdk/* /usr/jdk64',
 not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java',
 )
 self.assertResourceCalled('Execute', ('chgrp', '-R', u'hadoop', 
u'/usr/jdk64/jdk1.7.0_45'),

[5/6] ambari git commit: AMBARI-9962. HostCleanup.py does not remove packages (dlysnichenko)

2015-03-06 Thread dmitriusan 
AMBARI-9962. HostCleanup.py does not remove packages (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/71096fe6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/71096fe6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/71096fe6

Branch: refs/heads/branch-2.0.0
Commit: 71096fe6b2a06c5dd444c5f10a2b0ded256c7469
Parents: 9034c34
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Mar 6 20:54:21 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Mar 6 20:56:41 2015 +0200

--
 ambari-agent/src/main/python/ambari_agent/HostCleanup.py   | 2 +-
 .../src/test/python/resource_management/TestUserResource.py| 2 +-
 ambari-common/src/main/python/ambari_commons/constants.py  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/71096fe6/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py 
b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
index 3e7e83f..ca9bc41 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
@@ -477,7 +477,7 @@ class HostCleanup:
   # Run command as sudoer by default, if root no issues
   def run_os_command(self, cmd, runWithSudo=True):
 if runWithSudo:
-  cmd = AMBARI_SUDO_BINARY + cmd
+  cmd = /var/lib/ambari-agent/+AMBARI_SUDO_BINARY +   + cmd
 logger.info('Executing command: ' + str(cmd))
 if type(cmd) == str:
   cmd = shlex.split(cmd)

http://git-wip-us.apache.org/repos/asf/ambari/blob/71096fe6/ambari-agent/src/test/python/resource_management/TestUserResource.py
--
diff --git 
a/ambari-agent/src/test/python/resource_management/TestUserResource.py 
b/ambari-agent/src/test/python/resource_management/TestUserResource.py
index c757361..3062881 100644
--- a/ambari-agent/src/test/python/resource_management/TestUserResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestUserResource.py
@@ -183,7 +183,7 @@ class TestUserResource(TestCase):
   user = User(mapred, action = create, groups = ['1','2','3'], 
   shell = /bin/bash)
 
-popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', 
'-c', ambari-sudo.sh  PATH=/bin -H -E usermod -G 1,2,3 -s /bin/bash mapred], 
shell=False, preexec_fn=None, stderr=-2, stdout=5, bufsize=1, env={'PATH': 
'/bin'}, cwd=None)
+popen_mock.assert_called_with(['/bin/bash', '--login', '--noprofile', 
'-c', 'ambari-sudo.sh  PATH=/bin -H -E usermod -G 1,2,3,hadoop -s /bin/bash 
mapred'], shell=False, preexec_fn=None, stderr=-2, stdout=5, env={'PATH': 
'/bin'}, bufsize=1, cwd=None)
 self.assertEqual(popen_mock.call_count, 1)
 
   @patch.object(subprocess, Popen)

http://git-wip-us.apache.org/repos/asf/ambari/blob/71096fe6/ambari-common/src/main/python/ambari_commons/constants.py
--
diff --git a/ambari-common/src/main/python/ambari_commons/constants.py 
b/ambari-common/src/main/python/ambari_commons/constants.py
index b823b31..99ff679 100644
--- a/ambari-common/src/main/python/ambari_commons/constants.py
+++ b/ambari-common/src/main/python/ambari_commons/constants.py
@@ -18,4 +18,4 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 '''
 
-AMBARI_SUDO_BINARY = ambari-sudo.sh
\ No newline at end of file
+AMBARI_SUDO_BINARY = ambari-sudo.sh

[4/6] ambari git commit: AMBARI-9964. Rolling Upgrade: Expose FinalizeUpgradeAction to API or force transition from UPGRADED to CURRENT for cluster_version via API request (dlysnichenko)

2015-03-06 Thread dmitriusan 
AMBARI-9964. Rolling Upgrade: Expose FinalizeUpgradeAction to API or force 
transition from UPGRADED to CURRENT for cluster_version via API request 
(dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9034c34d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9034c34d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9034c34d

Branch: refs/heads/branch-2.0.0
Commit: 9034c34decab7ba7731b421526c2f9db0c3093c0
Parents: 2d80c07
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Mar 6 20:53:27 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Mar 6 20:56:37 2015 +0200

--
 .../services/ClusterStackVersionService.java|  17 +++
 .../ClusterStackVersionResourceProvider.java| 102 ++-
 .../upgrades/FinalizeUpgradeAction.java |  10 +-
 ambari-server/src/main/python/upgradeHelper.py  |  47 +--
 ...ClusterStackVersionResourceProviderTest.java | 123 ++-
 .../src/test/python/TestUpgradeHelper.py|  53 
 6 files changed, 336 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9034c34d/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
index eb8a461..8fe1499 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
@@ -22,6 +22,7 @@ import java.util.Map;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -120,6 +121,22 @@ public class ClusterStackVersionService extends 
BaseService {
 return handleRequest(headers, body, ui, Request.Type.POST, 
createResource(null));
   }
 
+
+  /**
+   * Handles: POST /{clustername}/stack_versions requests
+   * triggering Finalize during manual Rolling Upgrade
+   *
+   * @param bodyhttp body
+   * @param headers http headers
+   * @param ui  uri info
+   * @return information regarding the created services
+   */
+  @PUT
+  @Produces(text/plain)
+  public Response updateRequests(String body, @Context HttpHeaders headers, 
@Context UriInfo ui) {
+return handleRequest(headers, body, ui, Request.Type.PUT, 
createResource(null));
+  }
+
   /**
* Create a cluster stack version resource instance.
*

http://git-wip-us.apache.org/repos/asf/ambari/blob/9034c34d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 0cf89a3..e93e653 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -27,13 +27,21 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
+import com.google.inject.Injector;
 import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.Role;
 import org.apache.ambari.server.StaticallyInject;
 import org.apache.ambari.server.actionmanager.ActionManager;
+import org.apache.ambari.server.actionmanager.HostRoleCommand;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
 import org.apache.ambari.server.actionmanager.RequestFactory;
 import org.apache.ambari.server.actionmanager.Stage;
 import org.apache.ambari.server.actionmanager.StageFactory;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.agent.ExecutionCommand;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.ActionExecutionContext;
@@ -58,6 +66,7 @@ import 
org.apache.ambari.server.orm.entities.HostVersionEntity;
 import org.apache.ambari.server.orm.entities.OperatingSystemEntity;
 import

[2/6] ambari git commit: AMBARI-9964. Rolling Upgrade: Expose FinalizeUpgradeAction to API or force transition from UPGRADED to CURRENT for cluster_version via API request (dlysnichenko)

2015-03-06 Thread dmitriusan 
AMBARI-9964. Rolling Upgrade: Expose FinalizeUpgradeAction to API or force 
transition from UPGRADED to CURRENT for cluster_version via API request 
(dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8775d884
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8775d884
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8775d884

Branch: refs/heads/trunk
Commit: 8775d8846da2ecaf82a16a92712d47d8bc5f5745
Parents: 4894eab
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Fri Mar 6 20:53:27 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Fri Mar 6 20:55:39 2015 +0200

--
 .../services/ClusterStackVersionService.java|  17 +++
 .../ClusterStackVersionResourceProvider.java| 102 ++-
 .../upgrades/FinalizeUpgradeAction.java |  10 +-
 ambari-server/src/main/python/upgradeHelper.py  |  47 +--
 ...ClusterStackVersionResourceProviderTest.java | 123 ++-
 .../src/test/python/TestUpgradeHelper.py|  53 
 6 files changed, 336 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8775d884/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
index eb8a461..8fe1499 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
@@ -22,6 +22,7 @@ import java.util.Map;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -120,6 +121,22 @@ public class ClusterStackVersionService extends 
BaseService {
 return handleRequest(headers, body, ui, Request.Type.POST, 
createResource(null));
   }
 
+
+  /**
+   * Handles: POST /{clustername}/stack_versions requests
+   * triggering Finalize during manual Rolling Upgrade
+   *
+   * @param bodyhttp body
+   * @param headers http headers
+   * @param ui  uri info
+   * @return information regarding the created services
+   */
+  @PUT
+  @Produces(text/plain)
+  public Response updateRequests(String body, @Context HttpHeaders headers, 
@Context UriInfo ui) {
+return handleRequest(headers, body, ui, Request.Type.PUT, 
createResource(null));
+  }
+
   /**
* Create a cluster stack version resource instance.
*

http://git-wip-us.apache.org/repos/asf/ambari/blob/8775d884/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 0cf89a3..e93e653 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -27,13 +27,21 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
+import com.google.inject.Injector;
 import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.Role;
 import org.apache.ambari.server.StaticallyInject;
 import org.apache.ambari.server.actionmanager.ActionManager;
+import org.apache.ambari.server.actionmanager.HostRoleCommand;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
 import org.apache.ambari.server.actionmanager.RequestFactory;
 import org.apache.ambari.server.actionmanager.Stage;
 import org.apache.ambari.server.actionmanager.StageFactory;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.agent.ExecutionCommand;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.ActionExecutionContext;
@@ -58,6 +66,7 @@ import 
org.apache.ambari.server.orm.entities.HostVersionEntity;
 import org.apache.ambari.server.orm.entities.OperatingSystemEntity;
 import

ambari git commit: AMBARI-9967. Metrics monitor fails to start if old psutil installed. (mpapirkovskyy)

2015-03-06 Thread mpapirkovskyy 
Repository: ambari
Updated Branches:
  refs/heads/trunk 6576da657 - 24b005a7e


AMBARI-9967. Metrics monitor fails to start if old psutil installed. 
(mpapirkovskyy)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24b005a7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24b005a7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24b005a7

Branch: refs/heads/trunk
Commit: 24b005a7edafe104e914a0763394a7757f8852a7
Parents: 6576da6
Author: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Authored: Sat Mar 7 00:10:45 2015 +0200
Committer: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Committed: Sat Mar 7 00:10:45 2015 +0200

--
 .../src/main/python/core/__init__.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/24b005a7/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
index 84bb8a8..264a95d 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
@@ -28,7 +28,7 @@ IS_WINDOWS = platform.system() == Windows
 if not IS_WINDOWS:
   for dir in os.walk(path).next()[1]:
 if 'lib' in dir:
-  sys.path.append(os.path.join(path, dir))
+  sys.path.insert(1, os.path.join(path, dir))
 
 try:
   import psutil

ambari git commit: AMBARI-9967. Metrics monitor fails to start if old psutil installed. (mpapirkovskyy)

2015-03-06 Thread mpapirkovskyy 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 d9dc9e393 - 3f9ae9ef0


AMBARI-9967. Metrics monitor fails to start if old psutil installed. 
(mpapirkovskyy)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3f9ae9ef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3f9ae9ef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3f9ae9ef

Branch: refs/heads/branch-2.0.0
Commit: 3f9ae9ef0cc9eb535a361592eb6b7540430b6768
Parents: d9dc9e3
Author: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Authored: Sat Mar 7 00:10:45 2015 +0200
Committer: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Committed: Sat Mar 7 00:13:58 2015 +0200

--
 .../src/main/python/core/__init__.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3f9ae9ef/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
index 84bb8a8..264a95d 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/__init__.py
@@ -28,7 +28,7 @@ IS_WINDOWS = platform.system() == Windows
 if not IS_WINDOWS:
   for dir in os.walk(path).next()[1]:
 if 'lib' in dir:
-  sys.path.append(os.path.join(path, dir))
+  sys.path.insert(1, os.path.join(path, dir))
 
 try:
   import psutil

ambari git commit: AMBARI-9955: Ambari-Server and Ambari-Agent fail to start on Windows (jluniya)

2015-03-06 Thread jluniya 
Repository: ambari
Updated Branches:
  refs/heads/trunk 24b005a7e - ef262ecf2


AMBARI-9955: Ambari-Server and Ambari-Agent fail to start on Windows (jluniya)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ef262ecf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef262ecf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef262ecf

Branch: refs/heads/trunk
Commit: ef262ecf2ad73ab23bc398bcb43765320aeda1ab
Parents: 24b005a
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Fri Mar 6 14:19:02 2015 -0800
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Fri Mar 6 14:19:02 2015 -0800

--
 ambari-common/src/main/python/resource_management/core/shell.py  | 2 +-
 .../common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py   | 4 
 2 files changed, 1 insertion(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ef262ecf/ambari-common/src/main/python/resource_management/core/shell.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/shell.py 
b/ambari-common/src/main/python/resource_management/core/shell.py
index b1ab0bc..d57a450 100644
--- a/ambari-common/src/main/python/resource_management/core/shell.py
+++ b/ambari-common/src/main/python/resource_management/core/shell.py
@@ -23,7 +23,6 @@ Ambari Agent
 __all__ = [non_blocking_call, checked_call, call, quote_bash_args, 
as_user, as_sudo]
 
 import os
-import pty
 import select
 import sys
 import logging
@@ -137,6 +136,7 @@ def _call(command, logoutput=None, throw_on_failure=True,
   for placeholder, replacement in PLACEHOLDERS_TO_STR.iteritems():
 command = command.replace(placeholder, replacement.format(env_str=env_str))
 
+  import pty
   master_fd, slave_fd = pty.openpty()
 
   # --noprofile is used to preserve PATH set for ambari-agent

http://git-wip-us.apache.org/repos/asf/ambari/blob/ef262ecf/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
index 57523a5..bc10adf 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py
@@ -183,10 +183,6 @@ class NameNode(Script):
 threshold = name_node_parameters['threshold']
 _print(Starting balancer with threshold = %s\n % threshold)
 
-if params.security_enabled:
-  Execute(format({kinit_path_local} -kt {hdfs_user_keytab} 
{hdfs_principal_name}),
-  user = params.hdfs_user)
-
 def calculateCompletePercent(first, current):
   return 1.0 - current.bytesLeftToMove/first.bytesLeftToMove