[21/36] ambari git commit: AMBARI-21376. Using URI naming format in dfs.datanode.data.dir causing datanodes startup failure (aonishuk)

[lpuskas]

AMBARI-21376. Using URI naming format in dfs.datanode.data.dir causing 
datanodes startup failure  (aonishuk)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 7554509f5ab1ddf262746ddab3c74f88c9f8154a
Parents: aa7a8c6
Author: Andrew Onishuk 
Authored: Thu Jun 29 20:44:11 2017 +0300
Committer: Andrew Onishuk 
Committed: Thu Jun 29 20:44:11 2017 +0300

--
 .../resource_management/libraries/functions/mounted_dirs_helper.py  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7554509f/ambari-common/src/main/python/resource_management/libraries/functions/mounted_dirs_helper.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/mounted_dirs_helper.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/mounted_dirs_helper.py
index 0ebd7e2..712eacf 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/mounted_dirs_helper.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/mounted_dirs_helper.py
@@ -115,6 +115,7 @@ def handle_mounted_dirs(func, dirs_string, 
history_filename, update_cache=True):
   dirs_unmounted = set() # set of dirs that have become unmounted
   valid_existing_dirs = []
 
+  dirs_string = dirs_string.replace("file:///","/")
   dirs_string = ",".join([re.sub(r'^\[.+\]', '', dfs_dir.strip()) for dfs_dir 
in dirs_string.split(",")])
   for dir in dirs_string.split(","):
 if dir is None or dir.strip() == "":

[32/36] ambari git commit: AMBARI-21366. ADDENDUM - Create property descriptions for internal Log Search configs (oleewere)

[lpuskas]

AMBARI-21366. ADDENDUM - Create property descriptions for internal Log Search 
configs (oleewere)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: ec0d01fcb4c9cf839de24cfa8e9c7f611be24d6e
Parents: a740b50
Author: oleewere 
Authored: Mon Jul 3 15:30:53 2017 +0200
Committer: oleewere 
Committed: Mon Jul 3 15:30:53 2017 +0200

--
 .../main/java/org/apache/ambari/logsearch/rest/InfoResource.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ec0d01fc/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/InfoResource.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/InfoResource.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/InfoResource.java
index f085678..6ea0bab 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/InfoResource.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/InfoResource.java
@@ -23,6 +23,7 @@ import javax.inject.Named;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,6 +49,7 @@ public class InfoResource {
 
   @GET
   @Path("/auth")
+  @Produces({"application/json"})
   @ApiOperation(GET_AUTH_DETAILS_OD)
   public Map getAuthInfo() {
 return infoManager.getAuthMap();
@@ -55,6 +57,7 @@ public class InfoResource {
 
   @GET
   @Path("/properties")
+  @Produces({"application/json"})
   @ApiOperation(GET_ALL_PROPERTIES_INFO_OD)
   public Map getPropertyDescriptions() {
 return infoManager.getPropertyDescriptions();
@@ -62,6 +65,7 @@ public class InfoResource {
 
   @GET
   @Path("/properties/{propertyFile}")
+  @Produces({"application/json"})
   @ApiOperation(GET_LOGSEARCH_PROPERTIES_INFO_OD)
   public List 
getPropertyFileDescription(@PathParam("propertyFile") String propertyFile) {
 return infoManager.getLogSearchPropertyDescriptions(propertyFile);

[14/36] ambari git commit: AMBARI-21099. Drop JDK 7 support for Ambari Server and Ambari managed services (AMS, LogSearch, Infra) (oleewere)

[lpuskas]

AMBARI-21099. Drop JDK 7 support for Ambari Server and Ambari managed services 
(AMS, LogSearch, Infra) (oleewere)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 2f0de6919ba8bb43ae156d66b39335f9860d26b9
Parents: f4fb174
Author: oleewere 
Authored: Wed Jun 28 21:15:48 2017 +0200
Committer: oleewere 
Committed: Wed Jun 28 21:16:11 2017 +0200

--
 ambari-server/docs/configuration/index.md   |  13 ++-
 .../ambari/server/agent/ExecutionCommand.java   |   4 +
 .../server/configuration/Configuration.java |  65 ++--
 .../controller/AmbariActionExecutionHelper.java |   2 +
 .../AmbariCustomCommandExecutionHelper.java |  12 +--
 .../AmbariManagementControllerImpl.java |   2 +
 .../internal/ClientConfigResourceProvider.java  |   9 +-
 .../apache/ambari/server/utils/StageUtils.java  |  54 ++
 ambari-server/src/main/python/ambari-server.py  |   2 +
 .../python/ambari_server/serverConfiguration.py |   6 ++
 .../main/python/ambari_server/serverSetup.py| 105 +--
 .../0.1.0/package/scripts/params.py |   4 +-
 .../0.1.0/package/scripts/params.py |  10 +-
 .../ATLAS/0.1.0.2.3/package/scripts/metadata.py |   8 +-
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |   1 +
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |   4 +-
 .../RANGER/0.4.0/package/scripts/params.py  |   1 +
 .../0.4.0/package/scripts/setup_ranger_xml.py   |  10 +-
 .../2.0.6/hooks/before-ANY/scripts/params.py|   2 +
 .../before-ANY/scripts/shared_initialization.py |  30 --
 .../2.0.6/hooks/before-START/scripts/params.py  |   4 +
 .../scripts/shared_initialization.py|  22 ++--
 .../HDP/3.0/hooks/before-ANY/scripts/params.py  |   3 +
 .../before-ANY/scripts/shared_initialization.py |  31 --
 .../3.0/hooks/before-START/scripts/params.py|   4 +
 .../scripts/shared_initialization.py|  22 ++--
 .../main/resources/stacks/HDP/3.0/metainfo.xml  |   2 +-
 .../PERF/1.0/hooks/before-ANY/scripts/params.py |   3 +
 .../before-ANY/scripts/shared_initialization.py |  23 +++-
 .../ClientConfigResourceProviderTest.java   |   8 ++
 .../ambari/server/utils/StageUtilsTest.java |  99 +
 .../src/test/python/TestAmbariServer.py |  49 -
 32 files changed, 524 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2f0de691/ambari-server/docs/configuration/index.md
--
diff --git a/ambari-server/docs/configuration/index.md 
b/ambari-server/docs/configuration/index.md
index 2394264..9dbe9c4 100644
--- a/ambari-server/docs/configuration/index.md
+++ b/ambari-server/docs/configuration/index.md
@@ -142,9 +142,9 @@ The following are the properties which can be used to 
configure Ambari.
 | http.x-content-type-options | The value that will be used to set the 
`X-CONTENT-TYPE` HTTP response header. |`nosniff` | 
 | http.x-frame-options | The value that will be used to set the 
`X-Frame-Options` HTTP response header. |`DENY` | 
 | http.x-xss-protection | The value that will be used to set the 
`X-XSS-Protection` HTTP response header. |`1; mode=block` | 
-| java.home | The location of the JDK on the Ambari Agent hosts.The 
following are examples of valid values:`/usr/jdk64/jdk1.7.0_45` | 
| 
-| jce.name | The name of the JCE policy ZIP file. The following are 
examples of valid values:`UnlimitedJCEPolicyJDK7.zip` | | 
-| jdk.name | The name of the JDK installation binary.The following 
are examples of valid values:`jdk-7u45-linux-x64.tar.gz` | | 
+| java.home | The location of the JDK on the Ambari Agent hosts. If 
stack.java.home exists, that is only used by Ambari Server (or you can find 
that as ambari_java_home in the commandParams on the agent side)The 
following are examples of valid values:`/usr/jdk64/jdk1.8.0_112` | 
| 
+| jce.name | The name of the JCE policy ZIP file. If stack.jce.name exists, 
that is only used by Ambari Server (or you can find that as ambari_jce_name in 
the commandParams on the agent side)The following are examples of 
valid values:`UnlimitedJCEPolicyJDK8.zip` | | 
+| jdk.name | The name of the JDK installation binary. If stack.jdk.name 
exists, that is only used by Ambari Server (or you can find that as 
ambari_jdk_name in the commandParams on the agent side)The following 
are examples of valid values:`jdk-8u112-linux-x64.tar.gz` | | 
 | kdcserver.connection.check.timeout | The timeout, in milliseconds, to wait 
when communicating with a Kerberos Key 

[18/36] ambari git commit: AMBARI-21363 ORA-00911 error during Ambari server schema upgrade due to incorrect syntax of Update statement (dgrinenko)

[lpuskas]

AMBARI-21363 ORA-00911 error during Ambari server schema upgrade due to 
incorrect syntax of Update statement (dgrinenko)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 4cd3150111560a43dd8028e6f14b2abf753e3d8b
Parents: 09e5d41
Author: Dmytro Grinenko 
Authored: Thu Jun 29 15:17:29 2017 +0300
Committer: Dmytro Grinenko 
Committed: Thu Jun 29 15:17:29 2017 +0300

--
 .../ambari/server/orm/DBAccessorImpl.java   | 43 +++-
 .../orm/helpers/dbms/GenericDbmsHelper.java |  2 +-
 2 files changed, 25 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4cd31501/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 83ea8e1..a88430b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -204,6 +204,27 @@ public class DBAccessorImpl implements DBAccessor {
 return objectName;
   }
 
+  /**
+   * Setting arguments for prepared statement
+   *
+   * @param preparedStatement {@link PreparedStatement} object
+   * @param arguments array of arguments
+   *
+   * @throws SQLException
+   */
+  private void setArgumentsForPreparedStatement(PreparedStatement 
preparedStatement, Object[] arguments) throws SQLException{
+for (int i = 0; i < arguments.length; i++) {
+  if (arguments[i] instanceof byte[]) {
+byte[] binaryData = (byte[]) arguments[i];
+
+// JDBC drivers supports only this function signature
+preparedStatement.setBinaryStream(i+1, new 
ByteArrayInputStream(binaryData), binaryData.length);
+  } else {
+preparedStatement.setObject(i+1, arguments[i]);
+  }
+}
+  }
+
   @Override
   public boolean tableExists(String tableName) throws SQLException {
 boolean result = false;
@@ -878,16 +899,8 @@ public class DBAccessorImpl implements DBAccessor {
 LOG.info("Executing prepared query: {}", query);
 
 PreparedStatement preparedStatement = 
getConnection().prepareStatement(query);
+setArgumentsForPreparedStatement(preparedStatement, arguments);
 
-  for (int i = 0; i < arguments.length; i++) {
-if (arguments[i] instanceof byte[]) {
-  byte[] binaryData = (byte[]) arguments[i];
-  // JDBC drivers supports only this function signature
-  preparedStatement.setBinaryStream(i+1, new 
ByteArrayInputStream(binaryData), binaryData.length);
-} else {
-  preparedStatement.setObject(i+1, arguments[i]);
-}
-  }
 try {
 preparedStatement.execute();
 } catch (SQLException e) {
@@ -908,7 +921,7 @@ public class DBAccessorImpl implements DBAccessor {
{@inheritDoc}
*/
   public void executePreparedUpdate(String query, Object...arguments) throws 
SQLException {
-executePreparedQuery(query, false, arguments);
+executePreparedUpdate(query, false, arguments);
   }
 
   /**
@@ -918,16 +931,8 @@ public class DBAccessorImpl implements DBAccessor {
 LOG.info("Executing prepared query: {}", query);
 
 PreparedStatement preparedStatement = 
getConnection().prepareStatement(query);
+setArgumentsForPreparedStatement(preparedStatement, arguments);
 
-for (int i = 0; i <= arguments.length; i++) {
-  if (arguments[i] instanceof byte[]) {
-byte[] binaryData = (byte[]) arguments[i];
-// JDBC drivers supports only this function signature
-preparedStatement.setBinaryStream(i+1, new 
ByteArrayInputStream(binaryData), binaryData.length);
-  } else {
-preparedStatement.setObject(i+1, arguments[i]);
-  }
-}
 try {
   preparedStatement.executeUpdate();
 } catch (SQLException e) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/4cd31501/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
index 56274c5..e2a1f38 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/GenericDbmsHelper.java
+++ 

[09/36] ambari git commit: AMBARI-21352.Workflow Manager view build failure(Venkata Sairam)

[lpuskas]

AMBARI-21352.Workflow Manager view build failure(Venkata Sairam)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: aac9fe6e2e358b4ad1a1cfb0b86c3231897e38f1
Parents: 5e50042
Author: Venkata Sairam 
Authored: Wed Jun 28 14:56:09 2017 +0530
Committer: Venkata Sairam 
Committed: Wed Jun 28 14:56:09 2017 +0530

--
 contrib/views/wfmanager/src/main/resources/ui/bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aac9fe6e/contrib/views/wfmanager/src/main/resources/ui/bower.json
--
diff --git a/contrib/views/wfmanager/src/main/resources/ui/bower.json 
b/contrib/views/wfmanager/src/main/resources/ui/bower.json
index 3f9de44..9812fa6 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/bower.json
+++ b/contrib/views/wfmanager/src/main/resources/ui/bower.json
@@ -21,7 +21,7 @@
 "abdmob/x2js": "~1.2.0",
 "datatables": "~1.10.11",
 "vkBeautify": "https://github.com/vkiryukhin/vkBeautify.git;,
-"cytoscape": "2.7.20",
+"cytoscape": "2.7.18",
 "cytoscape-dagre": "~1.3.0",
 "cytoscape-panzoom": "~2.4.0",
 "codemirror": "~5.15.0",

[26/36] ambari git commit: AMBARI-21354.Apply KerberosInterpreter related changes in Ambari(Prabhjyot Singh via Venkata Sairam)

[lpuskas]

AMBARI-21354.Apply KerberosInterpreter related changes in Ambari(Prabhjyot 
Singh via Venkata Sairam)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 979a07b5c82aa831405768019253e8292c9f771e
Parents: 9a17ca7
Author: Venkata Sairam 
Authored: Mon Jul 3 12:54:01 2017 +0530
Committer: Venkata Sairam 
Committed: Mon Jul 3 12:55:08 2017 +0530

--
 .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/979a07b5/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index bdef319..4032b2c 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -92,6 +92,11 @@ export ZEPPELIN_PID_DIR={{zeppelin_pid_dir}}
 export ZEPPELIN_INTP_CLASSPATH_OVERRIDES="{{external_dependency_conf}}"
  Spark interpreter configuration 
 
+## Kerberos ticket refresh setting
+##
+export KINIT_FAIL_THRESHOLD=5
+export LAUNCH_KERBEROS_REFRESH_INTERVAL=1d
+
 ## Use provided spark installation ##
 ## defining SPARK_HOME makes Zeppelin run spark interpreter process using 
spark-submit
 ##

[33/36] ambari git commit: Revert "AMBARI-21380. Force to use JDK 8 for Ambari Server maven build (oleewere)"

[lpuskas]

Revert "AMBARI-21380. Force to use JDK 8 for Ambari Server maven build 
(oleewere)"

This reverts commit a740b50fd2866a317840f09859cc703ebdd4a26b.


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 15342be3c1a30739f62402aeb6ad6c4a06ceb4f0
Parents: ec0d01f
Author: oleewere 
Authored: Mon Jul 3 16:24:51 2017 +0200
Committer: oleewere 
Committed: Mon Jul 3 16:24:51 2017 +0200

--
 ambari-server/pom.xml | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/15342be3/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index f3eb66f..4b75d9b 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -51,7 +51,6 @@
 src/main/package 
 ALL 
 none 
-1.8
   
   
 
@@ -112,8 +111,6 @@
 maven-compiler-plugin
 3.2
 
-  ${jdk.version}
-  ${jdk.version}
   false
   
 -Xlint:${xlint}

[35/36] ambari git commit: AMBARI-21380. Force to use JDK 8 for Ambari Server maven build (oleewere)

[lpuskas]

AMBARI-21380. Force to use JDK 8 for Ambari Server maven build (oleewere)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: aba2db1f5351296af8fae627a22858b907a1c90f
Parents: 137ad20
Author: oleewere 
Authored: Mon Jul 3 14:01:21 2017 +0200
Committer: oleewere 
Committed: Tue Jul 4 13:55:01 2017 +0200

--
 ambari-server/pom.xml   | 5 -
 .../controller/internal/ClientConfigResourceProviderTest.java   | 2 +-
 .../ambari/server/view/persistence/DataStoreImplTest.java   | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aba2db1f/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 4b75d9b..878665e 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -51,6 +51,7 @@
 src/main/package 
 ALL 
 none 
+1.8
   
   
 
@@ -111,6 +112,8 @@
 maven-compiler-plugin
 3.2
 
+  ${jdk.version}
+  ${jdk.version}
   false
   
 -Xlint:${xlint}
@@ -716,7 +719,7 @@
 maven-surefire-plugin
 
   ${skipSurefireTests}
-  -Xmx1024m -XX:MaxPermSize=512m -Xms512m
+  -Xmx1024m -Xms512m
 
   
   ${testcase.groups}

http://git-wip-us.apache.org/repos/asf/ambari/blob/aba2db1f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
index 1f906ad..3ccb375 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
@@ -594,10 +594,10 @@ public class ClientConfigResourceProviderTest {
 expect(configHelper.getPropertyValuesWithPropertyType(stackId, 
PropertyInfo.PropertyType.USER, cluster, desiredConfigMap)).andReturn(userSet);
 PowerMock.expectNew(File.class, new Class[]{String.class}, 
anyObject(String.class)).andReturn(mockFile).anyTimes();
 PowerMock.mockStatic(File.class);
+expect(mockFile.exists()).andReturn(true);
 expect(File.createTempFile(anyString(), anyString(), 
anyObject(File.class))).andReturn(PowerMock.createNiceMock(File.class));
 PowerMock.createNiceMockAndExpectNew(PrintWriter.class, anyObject());
 PowerMock.mockStatic(Runtime.class);
-expect(mockFile.exists()).andReturn(true);
 String commandLine = "ambari-python-wrap " + commonServicesPath + 
"/PIG/package/null generate_configs null " +
 commonServicesPath + "/PIG/package 
/var/lib/ambari-server/tmp/structured-out.json " +
 "INFO /var/lib/ambari-server/tmp";

http://git-wip-us.apache.org/repos/asf/ambari/blob/aba2db1f/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java
index fd3f4e4..9bdaf5d 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java
@@ -164,9 +164,9 @@ public class DataStoreImplTest {
 dataStore.store(new TestEntity("foo", new TestSubEntity("bar")));
 
 Assert.assertEquals("bar", entityCapture.getValue().get("DS_name"));
-Assert.assertEquals(99, entityCapture.getValue().get("DS_id"));
+Assert.assertEquals(99, (int) entityCapture.getValue().get("DS_id"));
 
-Assert.assertEquals(100, entityCapture2.getValue().get("DS_id"));
+Assert.assertEquals(100, (int) entityCapture2.getValue().get("DS_id"));
 Assert.assertEquals("foo", entityCapture2.getValue().get("DS_name"));
 
 // verify mocks

[12/36] ambari git commit: AMBARI-21362. Ambari upgrade not idempotent due to column move

[lpuskas]

AMBARI-21362. Ambari upgrade not idempotent due to column move


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 5c874ccb40b282e5074588906cb7de1f7eeae614
Parents: a3681c0
Author: Attila Doroszlai 
Authored: Tue Jun 27 14:33:27 2017 +0200
Committer: Attila Doroszlai 
Committed: Wed Jun 28 18:31:49 2017 +0200

--
 .../ambari/server/orm/DBAccessorImpl.java   |  5 +++-
 .../ambari/server/orm/DBAccessorImplTest.java   | 29 
 2 files changed, 33 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5c874ccb/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 13e7d7d..83ea8e1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -1411,7 +1411,10 @@ public class DBAccessorImpl implements DBAccessor {
   public void moveColumnToAnotherTable(String sourceTableName, DBColumnInfo 
sourceColumn, String sourceIDFieldName,
   String targetTableName, DBColumnInfo targetColumn, String 
targetIDFieldName, Object initialValue) throws SQLException {
 
-if (this.tableHasColumn(sourceTableName, sourceIDFieldName)) {
+if (tableHasColumn(sourceTableName, sourceIDFieldName) &&
+  tableHasColumn(sourceTableName, sourceColumn.getName()) &&
+  tableHasColumn(targetTableName, targetIDFieldName)
+) {
 
   final String moveSQL = 
dbmsHelper.getCopyColumnToAnotherTableStatement(sourceTableName, 
sourceColumn.getName(),
 sourceIDFieldName, targetTableName, 
targetColumn.getName(),targetIDFieldName);

http://git-wip-us.apache.org/repos/asf/ambari/blob/5c874ccb/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
index ca2674c..b4ffbf1 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java
@@ -638,4 +638,33 @@ public class DBAccessorImplTest {
 }
 
}
+
+  @Test
+  public void testMoveNonexistentColumnIsNoop() throws Exception {
+DBAccessorImpl dbAccessor = injector.getInstance(DBAccessorImpl.class);
+String sourceTableName = getFreeTableName();
+String targetTableName = getFreeTableName();
+int testRowAmount = 10;
+
+createMyTable(sourceTableName, "col1");
+createMyTable(targetTableName, "col1", "col2");
+
+for (Integer i=0; i < testRowAmount; i++){
+  dbAccessor.insertRow(sourceTableName,
+new String[] {"id", "col1"},
+new String[]{i.toString(), String.format("'source,1,%s'", i)}, false);
+
+  dbAccessor.insertRow(targetTableName,
+new String[] {"id", "col1", "col2"},
+new String[]{i.toString(), String.format("'target,1,%s'", i), 
String.format("'target,2,%s'", i)}, false);
+}
+
+DBColumnInfo sourceColumn = new DBColumnInfo("col2", String.class, null, 
null, false);
+DBColumnInfo targetColumn = new DBColumnInfo("col2", String.class, null, 
null, false);
+
+dbAccessor.moveColumnToAnotherTable(sourceTableName, sourceColumn, "id",
+  targetTableName, targetColumn, "id", "initial");
+
+// should not result in exception due to unknown column in source table
+  }
 }

[11/36] ambari git commit: AMBARI-21360: Ability to delete a view instance from view instance list (sangeetar)

[lpuskas]

AMBARI-21360: Ability to delete a view instance from view instance list 
(sangeetar)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: a3681c0199f31511170770d454697206cbeeeda3
Parents: 3446283
Author: Sangeeta Ravindran 
Authored: Wed Jun 28 09:29:57 2017 -0700
Committer: Sangeeta Ravindran 
Committed: Wed Jun 28 09:29:57 2017 -0700

--
 AMBARI-21360.patch  | 45 
 .../controllers/ambariViews/ViewsListCtrl.js| 20 +
 .../app/views/ambariViews/listTable.html|  3 ++
 3 files changed, 68 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a3681c01/AMBARI-21360.patch
--
diff --git a/AMBARI-21360.patch b/AMBARI-21360.patch
new file mode 100644
index 000..c26f3a0
--- /dev/null
+++ b/AMBARI-21360.patch
@@ -0,0 +1,45 @@
+diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
+index c41e5d4..4e7bae3 100644
+--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
+@@ -132,6 +132,26 @@ angular.module('ambariAdminConsole')
+ }
+   };
+ 
++  $scope.deleteInstance = function(instance) {
++  ConfirmationModal.show(
++$t('common.delete', {
++  term: $t('views.viewInstance')
++}),
++$t('common.deleteConfirmation', {
++  instanceType: $t('views.viewInstance'),
++  instanceName: instance.ViewInstanceInfo.label
++})
++  ).then(function() {
++View.deleteInstance(instance.ViewInstanceInfo.view_name, 
instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name)
++  .then(function() {
++loadViews();
++  })
++  .catch(function(data) {
++Alert.error($t('views.alerts.cannotDeleteInstance'), 
data.data.message);
++  });
++  });
++};
++
+   $scope.reloadViews = function () {
+ loadViews();
+   };
+diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
+index 59c322f..91b9a93 100644
+--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
+@@ -81,6 +81,9 @@
+ 
+ 
+ 
++
++
++
+ 
+ 
+ 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3681c01/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
index c41e5d4..4e7bae3 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
@@ -132,6 +132,26 @@ angular.module('ambariAdminConsole')
 }
   };
 
+  $scope.deleteInstance = function(instance) {
+  ConfirmationModal.show(
+$t('common.delete', {
+  term: $t('views.viewInstance')
+}),
+$t('common.deleteConfirmation', {
+  instanceType: $t('views.viewInstance'),
+  instanceName: instance.ViewInstanceInfo.label
+})
+  ).then(function() {
+View.deleteInstance(instance.ViewInstanceInfo.view_name, 
instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name)
+  .then(function() {
+loadViews();
+  })
+  .catch(function(data) {
+Alert.error($t('views.alerts.cannotDeleteInstance'), 
data.data.message);
+  });
+  });
+};
+
   $scope.reloadViews = function () {
 loadViews();
   };

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3681c01/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html

[17/36] ambari git commit: AMBARI-21343. Cleanup relevant Kerberos identities when a component is removed - addendum: fix missing copyrights (amagyar)

[lpuskas]

AMBARI-21343. Cleanup relevant Kerberos identities when a component is removed 
- addendum: fix missing copyrights (amagyar)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 09e5d41c5d52339a0edea97886acf0fd38ee8a91
Parents: 8b5c7db
Author: Attila Magyar 
Authored: Thu Jun 29 12:14:54 2017 +0200
Committer: Attila Magyar 
Committed: Thu Jun 29 12:14:54 2017 +0200

--
 .../controller/OrderedRequestStageContainer.java   | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09e5d41c/ambari-server/src/main/java/org/apache/ambari/server/controller/OrderedRequestStageContainer.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/OrderedRequestStageContainer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/OrderedRequestStageContainer.java
index 6d8b5a3..4ac6896 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/OrderedRequestStageContainer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/OrderedRequestStageContainer.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.ambari.server.controller;
 
 import org.apache.ambari.server.AmbariException;

[13/36] ambari git commit: AMBARI-21360: Ability to delete a view instance from view instance list (sangeetar)

[lpuskas]

AMBARI-21360: Ability to delete a view instance from view instance list 
(sangeetar)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: f4fb1742b1ba29247da897f4ca1dd67a82a34c1b
Parents: 5c874cc
Author: Sangeeta Ravindran 
Authored: Wed Jun 28 10:49:31 2017 -0700
Committer: Sangeeta Ravindran 
Committed: Wed Jun 28 10:49:31 2017 -0700

--
 AMBARI-21360.patch | 45 -
 1 file changed, 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f4fb1742/AMBARI-21360.patch
--
diff --git a/AMBARI-21360.patch b/AMBARI-21360.patch
deleted file mode 100644
index c26f3a0..000
--- a/AMBARI-21360.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
-index c41e5d4..4e7bae3 100644
 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
-+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js
-@@ -132,6 +132,26 @@ angular.module('ambariAdminConsole')
- }
-   };
- 
-+  $scope.deleteInstance = function(instance) {
-+  ConfirmationModal.show(
-+$t('common.delete', {
-+  term: $t('views.viewInstance')
-+}),
-+$t('common.deleteConfirmation', {
-+  instanceType: $t('views.viewInstance'),
-+  instanceName: instance.ViewInstanceInfo.label
-+})
-+  ).then(function() {
-+View.deleteInstance(instance.ViewInstanceInfo.view_name, 
instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name)
-+  .then(function() {
-+loadViews();
-+  })
-+  .catch(function(data) {
-+Alert.error($t('views.alerts.cannotDeleteInstance'), 
data.data.message);
-+  });
-+  });
-+};
-+
-   $scope.reloadViews = function () {
- loadViews();
-   };
-diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
-index 59c322f..91b9a93 100644
 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
-+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html
-@@ -81,6 +81,9 @@
- 
- 
- 
-+
-+
-+
- 
- 
- 

[08/36] ambari git commit: AMBARI-21256 : As part of START_ALL Ranger kms starts after hbase and hive causing their start failure (Vishal Suvagia via mugdha)

[lpuskas]

AMBARI-21256 : As part of START_ALL Ranger kms starts after hbase and hive 
causing their start failure (Vishal Suvagia via mugdha)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 5e50042a78e4ddcb8e50bb28289ba67c50fb502c
Parents: 4c1ea4c
Author: Vishal Suvagia 
Authored: Thu Jun 15 15:27:47 2017 +0530
Committer: Mugdha Varadkar 
Committed: Wed Jun 28 14:00:01 2017 +0530

--
 .../common-services/HBASE/0.96.0.2.0/role_command_order.json  | 3 +--
 .../common-services/HBASE/2.0.0.3.0/role_command_order.json   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5e50042a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json
 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json
index 110b179..58d0c1c 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/role_command_order.json
@@ -4,7 +4,6 @@
 "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"],
 "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", 
"HBASE_REGIONSERVER-START"],
 "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"],
-"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", 
"ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"]
-
+"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", 
"ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "RANGER_KMS_SERVER-START"]
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/5e50042a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json
 
b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json
index 44d0c61..69f4bf6 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/role_command_order.json
@@ -4,7 +4,7 @@
 "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"],
 "HBASE_SERVICE_CHECK-SERVICE_CHECK": ["HBASE_MASTER-START", 
"HBASE_REGIONSERVER-START"],
 "HBASE_MASTER-STOP": ["HBASE_REGIONSERVER-STOP"],
-"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", 
"ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START"],
+"HBASE_MASTER-START": ["NAMENODE-START", "DATANODE-START", 
"ZOOKEEPER_SERVER-START", "RANGER_USERSYNC-START", "RANGER_KMS_SERVER-START"],
 "PHOENIX_QUERY_SERVER-START": ["HBASE_MASTER-START"]
   }
 }

[34/36] ambari git commit: AMBARI-21396. /usr/sbin/ambari-agent missing after Ambari upgrade (aonishuk)

[lpuskas]

AMBARI-21396. /usr/sbin/ambari-agent missing after Ambari upgrade (aonishuk)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 137ad20b0d055b9dff38674e6230450bf84a9305
Parents: 15342be
Author: Andrew Onishuk 
Authored: Mon Jul 3 17:55:42 2017 +0300
Committer: Andrew Onishuk 
Committed: Mon Jul 3 17:55:42 2017 +0300

--
 ambari-agent/src/main/package/rpm/posttrans_agent.sh | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/137ad20b/ambari-agent/src/main/package/rpm/posttrans_agent.sh
--
diff --git a/ambari-agent/src/main/package/rpm/posttrans_agent.sh 
b/ambari-agent/src/main/package/rpm/posttrans_agent.sh
index c301fc3..723bb93 100644
--- a/ambari-agent/src/main/package/rpm/posttrans_agent.sh
+++ b/ambari-agent/src/main/package/rpm/posttrans_agent.sh
@@ -18,6 +18,8 @@ 
RESOURCE_MANAGEMENT_DIR="/usr/lib/python2.6/site-packages/resource_management"
 RESOURCE_MANAGEMENT_DIR_AGENT="/usr/lib/ambari-agent/lib/resource_management"
 JINJA_DIR="/usr/lib/python2.6/site-packages/ambari_jinja2"
 JINJA_AGENT_DIR="/usr/lib/ambari-agent/lib/ambari_jinja2"
+AMBARI_AGENT_BINARY="/etc/init.d/ambari-agent"
+AMBARI_AGENT_BINARY_SYMLINK="/usr/sbin/ambari-agent"
 
 # remove RESOURCE_MANAGEMENT_DIR if it's a directory
 if [ -d "$RESOURCE_MANAGEMENT_DIR" ]; then  # resource_management dir exists
@@ -35,4 +37,9 @@ if [ ! -d "$JINJA_DIR" ]; then
   ln -s "$JINJA_AGENT_DIR" "$JINJA_DIR"
 fi
 
+# setting ambari-agent binary symlink
+if [ ! -f "$AMBARI_AGENT_BINARY_SYMLINK" ]; then
+  ln -s "$AMBARI_AGENT_BINARY" "$AMBARI_AGENT_BINARY_SYMLINK"
+fi
+
 exit 0
\ No newline at end of file

[24/36] ambari git commit: AMBARI-21108 : Hive view 1.5 was using default DB for use statement in upload table feature. corrected it to use selected database (nitirajrathore)

[lpuskas]

AMBARI-21108 : Hive view 1.5 was using default DB for use statement in upload 
table feature. corrected it to use selected database (nitirajrathore)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: d0f12bff5eaeac764ec9ddf282d6e9e96001dc41
Parents: ae6b74f
Author: Nitiraj Singh Rathore 
Authored: Fri Jun 30 19:26:55 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Fri Jun 30 19:27:28 2017 +0530

--
 .../ambari/view/hive2/resources/uploads/UploadService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d0f12bff/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/uploads/UploadService.java
--
diff --git 
a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/uploads/UploadService.java
 
b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/uploads/UploadService.java
index a979dc9..040573e 100644
--- 
a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/uploads/UploadService.java
+++ 
b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/resources/uploads/UploadService.java
@@ -327,7 +327,7 @@ public class UploadService extends BaseService {
   String insertQuery = generateInsertFromQuery(input);
   LOG.info("insertQuery : {}", insertQuery);
 
-  Job job = createJob(insertQuery, "default");
+  Job job = createJob(insertQuery, input.getFromDatabase());
   LOG.info("Job created for insert from temp table : {}", job);
   return Response.ok(job).build();
 } catch (WebApplicationException e) {
@@ -348,7 +348,7 @@ public class UploadService extends BaseService {
   String deleteQuery = generateDeleteQuery(input);
   LOG.info("deleteQuery : {}", deleteQuery);
 
-  Job job = createJob(deleteQuery, "default");
+  Job job = createJob(deleteQuery, input.getDatabase());
   LOG.info("Job created for delete temp table : {} ", job);
   return Response.ok(job).build();
 } catch (WebApplicationException e) {

[29/36] ambari git commit: AMBARI-21272. LDAP sync requires user to be root (echekanskiy)

[lpuskas]

AMBARI-21272. LDAP sync requires user to be root (echekanskiy)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 8e9df940fcc045c7b22cc571cd58d0a1e82dd530
Parents: b5e40f9
Author: Eugene Chekanskiy 
Authored: Mon Jul 3 13:15:56 2017 +0300
Committer: Eugene Chekanskiy 
Committed: Mon Jul 3 13:15:56 2017 +0300

--
 .../src/main/python/ambari_server/setupSecurity.py |  4 
 ambari-server/src/test/python/TestAmbariServer.py  | 13 +
 2 files changed, 1 insertion(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e9df940/ambari-server/src/main/python/ambari_server/setupSecurity.py
--
diff --git a/ambari-server/src/main/python/ambari_server/setupSecurity.py 
b/ambari-server/src/main/python/ambari_server/setupSecurity.py
index 1508d27..17d1025 100644
--- a/ambari-server/src/main/python/ambari_server/setupSecurity.py
+++ b/ambari-server/src/main/python/ambari_server/setupSecurity.py
@@ -270,10 +270,6 @@ class LdapSyncOptions:
 #
 def sync_ldap(options):
   logger.info("Sync users and groups with configured LDAP.")
-  if not is_root():
-err = 'Ambari-server sync-ldap should be run with ' \
-  'root-level privileges'
-raise FatalException(4, err)
 
   properties = get_ambari_properties()
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e9df940/ambari-server/src/test/python/TestAmbariServer.py
--
diff --git a/ambari-server/src/test/python/TestAmbariServer.py 
b/ambari-server/src/test/python/TestAmbariServer.py
index c511237..1c4ebaf 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -7675,13 +7675,12 @@ class TestAmbariServer(TestCase):
   @patch("urllib2.urlopen")
   @patch("urllib2.Request")
   @patch("base64.encodestring")
-  @patch("ambari_server.setupSecurity.is_root")
   @patch("ambari_server.setupSecurity.is_server_runing")
   @patch("ambari_server.setupSecurity.get_ambari_properties")
   @patch("ambari_server.setupSecurity.get_validated_string_input")
   @patch("ambari_server.setupSecurity.logger")
   def test_sync_ldap_forbidden(self, logger_mock, 
get_validated_string_input_method, get_ambari_properties_method,
-is_server_runing_method, is_root_method,
+is_server_runing_method,
 encodestring_method, request_constructor, 
urlopen_method):
 
 options = self._create_empty_options_mock()
@@ -7690,16 +7689,6 @@ class TestAmbariServer(TestCase):
 options.ldap_sync_users = None
 options.ldap_sync_groups = None
 
-is_root_method.return_value = False
-try:
-  sync_ldap(options)
-  self.fail("Should throw exception if not root")
-except FatalException as fe:
-  # Expected
-  self.assertTrue("root-level" in fe.reason)
-  pass
-is_root_method.return_value = True
-
 is_server_runing_method.return_value = (None, None)
 try:
   sync_ldap(options)

[36/36] ambari git commit: AMBARI-21333 Extract Log Search part from stack advisor to a separate service advisor (mgergely)

[lpuskas]

AMBARI-21333 Extract Log Search part from stack advisor to a separate service 
advisor (mgergely)

Change-Id: Ia65deffc6d72bf0202ab4cff130f1feb22970a4d


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 8ba5c3e3ae582820828b345bb85da7aa935f637e
Parents: aba2db1
Author: Miklos Gergely 
Authored: Tue Jul 4 15:20:52 2017 +0200
Committer: Miklos Gergely 
Committed: Tue Jul 4 15:20:52 2017 +0200

--
 .../AMBARI_INFRA/0.1.0/service_advisor.py   | 133 +
 .../LOGSEARCH/0.5.0/service_advisor.py  | 188 +++
 .../stacks/HDP/2.2/services/stack_advisor.py|  66 ---
 .../LOGSEARCH/test_service_advisor.py   | 164 
 .../stacks/2.3/common/test_stack_advisor.py | 123 
 5 files changed, 485 insertions(+), 189 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8ba5c3e3/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/service_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/service_advisor.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/service_advisor.py
new file mode 100644
index 000..9b6aace
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/service_advisor.py
@@ -0,0 +1,133 @@
+#!/usr/bin/env ambari-python-wrap
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+# Python imports
+import imp
+import os
+import traceback
+import re
+import socket
+import fnmatch
+
+
+from resource_management.core.logger import Logger
+
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+STACKS_DIR = os.path.join(SCRIPT_DIR, '../../../stacks/')
+PARENT_FILE = os.path.join(STACKS_DIR, 'service_advisor.py')
+
+try:
+  with open(PARENT_FILE, 'rb') as fp:
+service_advisor = imp.load_module('service_advisor', fp, PARENT_FILE, 
('.py', 'rb', imp.PY_SOURCE))
+except Exception as e:
+  traceback.print_exc()
+  print "Failed to load parent"
+
+class Ambari_InfraServiceAdvisor(service_advisor.ServiceAdvisor):
+
+  def __init__(self, *args, **kwargs):
+self.as_super = super(Ambari_InfraServiceAdvisor, self)
+self.as_super.__init__(*args, **kwargs)
+
+# Always call these methods
+self.modifyMastersWithMultipleInstances()
+self.modifyCardinalitiesDict()
+self.modifyHeapSizeProperties()
+self.modifyNotValuableComponents()
+self.modifyComponentsNotPreferableOnServer()
+self.modifyComponentLayoutSchemes()
+
+  def modifyMastersWithMultipleInstances(self):
+"""
+Modify the set of masters with multiple instances.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  def modifyCardinalitiesDict(self):
+"""
+Modify the dictionary of cardinalities.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  def modifyHeapSizeProperties(self):
+"""
+Modify the dictionary of heap size properties.
+Must be overriden in child class.
+"""
+pass
+
+  def modifyNotValuableComponents(self):
+"""
+Modify the set of components whose host assignment is based on other 
services.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  def modifyComponentsNotPreferableOnServer(self):
+"""
+Modify the set of components that are not preferable on the server.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  def modifyComponentLayoutSchemes(self):
+"""
+Modify layout scheme dictionaries for components.
+The scheme dictionary basically maps the number of hosts to
+host index where component should exist.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  

[28/36] ambari git commit: AMBARI-21366. Create property descriptions for internal Log Search configs (oleewere)

[lpuskas]

AMBARI-21366. Create property descriptions for internal Log Search configs 
(oleewere)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: b5e40f9b22b30fdd21911cd7aef7ed2d09846de8
Parents: 979a07b
Author: oleewere 
Authored: Thu Jun 15 15:44:32 2017 +0200
Committer: oleewere 
Committed: Mon Jul 3 11:31:47 2017 +0200

--
 .../api/LogSearchPropertyDescription.java   |  59 +
 .../config/zookeeper/LogSearchConfigZK.java |  29 +
 .../org/apache/ambari/logsearch/LogSearch.java  |  11 +-
 .../ambari/logsearch/common/ApiDocStorage.java  |  90 ++
 .../logsearch/common/LogSearchConstants.java|   2 +
 .../logsearch/common/PropertiesHelper.java  |  17 ---
 .../common/PropertyDescriptionStorage.java  | 101 +++
 .../ambari/logsearch/conf/ApiDocConfig.java |   6 -
 .../logsearch/conf/ApplicationConfig.java   |   4 +-
 .../ambari/logsearch/conf/AuthPropsConfig.java  | 122 +++
 .../conf/LogSearchHttpHeaderConfig.java |  31 +
 .../ambari/logsearch/conf/SecurityConfig.java   |   1 +
 .../logsearch/conf/SolrAuditLogPropsConfig.java |  76 
 .../conf/SolrConnectionPropsConfig.java |  28 +
 .../conf/SolrEventHistoryPropsConfig.java   |  56 +++--
 .../logsearch/conf/SolrKerberosConfig.java  |  17 +++
 .../conf/SolrServiceLogPropsConfig.java |  38 ++
 .../ambari/logsearch/doc/DocConstants.java  |   4 +-
 .../ambari/logsearch/manager/InfoManager.java   |  59 +
 .../ambari/logsearch/manager/PublicManager.java |  48 
 .../model/response/PropertyDescriptionData.java |  62 ++
 .../ambari/logsearch/rest/InfoResource.java |  69 +++
 .../ambari/logsearch/rest/PublicResource.java   |  48 
 .../ambari/logsearch/rest/SwaggerResource.java  |  56 +
 .../apache/ambari/logsearch/util/SSLUtil.java   |  25 
 .../LogsearchKRBAuthenticationFilter.java   |  69 ++-
 ...rchExternalServerAuthenticationProvider.java |  23 +---
 .../src/main/resources/default.properties   |   2 -
 .../src/main/resources/logsearch.properties |   3 -
 ...xternalServerAuthenticationProviderTest.java |   4 +
 .../src/main/webapp/login.html  |  19 ++-
 .../logsearch/logsearch-https.properties|   4 -
 32 files changed, 1011 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b5e40f9b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchPropertyDescription.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchPropertyDescription.java
 
b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchPropertyDescription.java
new file mode 100644
index 000..330ef5c
--- /dev/null
+++ 
b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchPropertyDescription.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ambari.logsearch.config.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marker for describe static application level properties (e.g.: 
logsearch.properties/logfeeder.properties)
+ * Can be used to generate documentation about the internal configs.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+public @interface LogSearchPropertyDescription {
+
+  /**
+   * Name of the property inside the 

ambari git commit: AMBARI-21307 Rest resource for supporting ambari configurations

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 8ba5c3e3a -> 797240aca


AMBARI-21307 Rest resource for supporting ambari configurations


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 797240aca2494b1ce2e776a04dd5b43b7e025468
Parents: 8ba5c3e
Author: lpuskas <lpus...@apache.org>
Authored: Tue Jul 4 18:30:44 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Tue Jul 4 18:30:44 2017 +0200

--
 .../resources/ResourceInstanceFactoryImpl.java  |   4 +
 .../services/AmbariConfigurationService.java| 146 ++
 .../internal/AbstractProviderModule.java|   2 +-
 .../AmbariConfigurationResourceProvider.java| 273 +++
 .../internal/DefaultProviderModule.java |  26 +-
 .../ambari/server/controller/spi/Resource.java  |   5 +-
 .../server/orm/dao/AmbariConfigurationDAO.java  |  92 +++
 .../orm/entities/AmbariConfigurationEntity.java |  70 +
 .../orm/entities/ConfigurationBaseEntity.java   | 159 +++
 .../authorization/RoleAuthorization.java|  95 +++
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  25 +-
 .../src/main/resources/META-INF/persistence.xml |   2 +
 12 files changed, 835 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/797240ac/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
index 96e288f..b4c57fc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
@@ -471,6 +471,10 @@ public class ResourceInstanceFactoryImpl implements 
ResourceInstanceFactory {
   case RemoteCluster:
 resourceDefinition = new RemoteClusterResourceDefinition();
 break;
+  case AmbariConfiguration:
+resourceDefinition = new 
SimpleResourceDefinition(Resource.Type.AmbariConfiguration, 
"ambariconfiguration", "ambariconfigurations");
+
+break;
 
   default:
 throw new IllegalArgumentException("Unsupported resource type: " + 
type);

http://git-wip-us.apache.org/repos/asf/ambari/blob/797240ac/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
new file mode 100644
index 000..0fa6e44
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services;
+
+import java.util.Collections;
+
+import javax.ws.rs.DELETE;
+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;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.http.HttpStatus;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+
+/**
+ * Rest endpoint for managing ambari configurations. 

ambari git commit: AMBARI-21339 logviewer started along with nimbus if supervisor is not running on the same machine

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 b2f5ad72c -> 8f145ce77


AMBARI-21339 logviewer started along with nimbus if supervisor is not running 
on the same machine


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

Branch: refs/heads/branch-2.5
Commit: 8f145ce7727516e298f0a30c67a92e18b979b62a
Parents: b2f5ad7
Author: lpuskas <lpus...@apache.org>
Authored: Thu Jun 29 17:11:59 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Mon Jul 3 13:29:17 2017 +0200

--
 .../STORM/0.9.1/package/scripts/nimbus.py   |  8 ++-
 .../stacks/2.1/STORM/test_storm_nimbus.py   | 60 +++-
 .../stacks/2.1/configs/default-storm-start.json | 14 +
 .../test/python/stacks/2.1/configs/default.json | 13 +
 .../stacks/2.1/configs/secured-storm-start.json | 13 +
 .../test/python/stacks/2.1/configs/secured.json | 15 -
 6 files changed, 119 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8f145ce7/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus.py
 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus.py
index a6bc437..ab6dc3e 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus.py
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/nimbus.py
@@ -70,12 +70,18 @@ class NimbusDefault(Nimbus):
 setup_ranger_storm(upgrade_type=upgrade_type)
 service("nimbus", action="start")
 
+if "SUPERVISOR" not in params.config['localComponents']:
+  service("logviewer", action="start")
+
 
   def stop(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 service("nimbus", action="stop")
 
+if "SUPERVISOR" not in params.config['localComponents']:
+  service("logviewer", action="stop")
+
 
   def status(self, env):
 import status_params
@@ -85,7 +91,7 @@ class NimbusDefault(Nimbus):
   def get_log_folder(self):
 import params
 return params.log_dir
-  
+
   def get_user(self):
 import params
 return params.storm_user

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f145ce7/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py 
b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
index 35f057c..fd25126 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_nimbus.py
@@ -58,6 +58,15 @@ class TestStormNimbus(TestStormBase):
 owner = 'storm',
 group = 'hadoop',
 )
+self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh 
; export PATH=$JAVA_HOME/bin:$PATH ; storm logviewer > 
/var/log/storm/logviewer.out 2>&1 &\n echo $! > /var/run/storm/logviewer.pid',
+path = ['/usr/bin'],
+user = 'storm',
+not_if = "ambari-sudo.sh su storm -l -s /bin/bash -c 
'[RMF_EXPORT_PLACEHOLDER]ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps 
-p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1'",
+)
+self.assertResourceCalled('File', '/var/run/storm/logviewer.pid',
+owner = 'storm',
+group = 'hadoop',
+)
 self.assertNoMoreResources()
 
   def test_start_with_metrics_collector(self):
@@ -99,6 +108,15 @@ class TestStormNimbus(TestStormBase):
 owner = 'storm',
 group = 'hadoop',
 )
+self.assertResourceCalled('Execute', 'source /etc/storm/conf/storm-env.sh 
; export PATH=$JAVA_HOME/bin:$PATH ; storm logviewer > 
/var/log/storm/logviewer.out 2>&1 &\n echo $! > /var/run/storm/logviewer.pid',
+  path = ['/usr/bin'],
+  user = 'storm',
+  not_if = "ambari-sudo.sh su storm -l -s /bin/bash -c 
'[RMF_EXPORT_PLACEHOLDER]ls /var/run/storm/logviewer.pid >/dev/null 2>&1 && ps 
-p `cat /var/run/storm/logviewer.pid` >/dev/null 2>&1'",
+)
+self.assertResourceCalled('File', '/var/run/storm/logviewer.pid',
+  owner = 'storm',
+  group = 'hadoop',
+)
 self.assertNoMoreResources()
 
   def test_start_with_metri

[ambari] Git Push Summary [forced push!] [Forced Update!]

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 21bb9d9a3 -> 8ba5c3e3a (forced update)

ambari git commit: AMBARI-21307 using Gson for transformation to/from json

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 797240aca -> 21bb9d9a3


AMBARI-21307 using Gson for transformation to/from json


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 21bb9d9a36a0dc510a7bb924f1fc45fe44f9ee17
Parents: 797240a
Author: lpuskas <lpus...@apache.org>
Authored: Wed Jul 5 14:14:48 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Wed Jul 5 14:14:48 2017 +0200

--
 .../AmbariConfigurationResourceProvider.java| 42 
 1 file changed, 8 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/21bb9d9a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
index 6d5fe5b..5e5af9e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
@@ -14,7 +14,6 @@
 
 package org.apache.ambari.server.controller.internal;
 
-import java.io.IOException;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -41,11 +40,12 @@ import 
org.apache.ambari.server.orm.dao.AmbariConfigurationDAO;
 import org.apache.ambari.server.orm.entities.AmbariConfigurationEntity;
 import org.apache.ambari.server.orm.entities.ConfigurationBaseEntity;
 import org.apache.ambari.server.security.authorization.RoleAuthorization;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Sets;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 /**
  * Resource provider for AmbariConfiguration resources.
@@ -54,11 +54,9 @@ import com.google.common.collect.Sets;
 public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResourceProvider {
 
   private static final Logger LOGGER = 
LoggerFactory.getLogger(AmbariConfigurationResourceProvider.class);
-
   private static final String DEFAULT_VERSION_TAG = "Default version";
   private static final Integer DEFAULT_VERSION = 1;
 
-
   /**
* Resource property id constants.
*/
@@ -116,10 +114,14 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
   @Inject
   private static AmbariConfigurationDAO ambariConfigurationDAO;
 
+  private Gson gson;
+
   protected AmbariConfigurationResourceProvider() {
 super(properties, pkPropertyMap);
 
setRequiredCreateAuthorizations(EnumSet.of(RoleAuthorization.AMBARI_MANAGE_CONFIGURATION));
 
setRequiredDeleteAuthorizations(EnumSet.of(RoleAuthorization.AMBARI_MANAGE_CONFIGURATION));
+
+gson = new GsonBuilder().create();
   }
 
   @Override
@@ -181,7 +183,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 
   private Resource toResource(AmbariConfigurationEntity entity, Set 
requestedIds) throws AmbariException {
 Resource resource = new ResourceImpl(Resource.Type.AmbariConfiguration);
-Set<Map<String, String>> configurationSet = 
ConfigurationDataConverter.fromJson(entity.getConfigurationBaseEntity().getConfigurationData());
+Set<Map<String, String>> configurationSet = 
gson.fromJson(entity.getConfigurationBaseEntity().getConfigurationData(), 
Set.class);
 
 setResourceProperty(resource, ResourcePropertyId.ID.getPropertyId(), 
entity.getId(), requestedIds);
 setResourceProperty(resource, ResourcePropertyId.TYPE.getPropertyId(), 
entity.getConfigurationBaseEntity().getType(), requestedIds);
@@ -205,7 +207,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 throw new IllegalArgumentException("No configuration data is 
provided in the request");
   }
 
-  
ambariConfigurationEntity.getConfigurationBaseEntity().setConfigurationData(ConfigurationDataConverter.toJson(requestValue));
+  
ambariConfigurationEntity.getConfigurationBaseEntity().setConfigurationData(gson.toJson(requestValue));
   break;
 case TYPE:
   
ambariConfigurationEntity.getConfigurationBaseEntity().setType

ambari git commit: AMBARI-21307 Rest resource for supporting ambari configurations

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 29203a15d -> 529ac321d


AMBARI-21307 Rest resource for supporting ambari configurations


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 529ac321dd4e2c454b2fadd2218892931cd34a5f
Parents: 29203a1
Author: lpuskas <lpus...@apache.org>
Authored: Wed Jul 5 14:20:18 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Wed Jul 5 14:22:02 2017 +0200

--
 .../resources/ResourceInstanceFactoryImpl.java  |   4 +
 .../services/AmbariConfigurationService.java| 146 +++
 .../internal/AbstractProviderModule.java|   2 +-
 .../AmbariConfigurationResourceProvider.java| 247 +++
 .../internal/DefaultProviderModule.java |  26 +-
 .../ambari/server/controller/spi/Resource.java  |   5 +-
 .../server/orm/dao/AmbariConfigurationDAO.java  |  92 +++
 .../orm/entities/AmbariConfigurationEntity.java |  70 ++
 .../orm/entities/ConfigurationBaseEntity.java   | 159 
 .../authorization/RoleAuthorization.java|  95 +++
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  25 +-
 .../src/main/resources/META-INF/persistence.xml |   2 +
 12 files changed, 809 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/529ac321/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
index 96e288f..b4c57fc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
@@ -471,6 +471,10 @@ public class ResourceInstanceFactoryImpl implements 
ResourceInstanceFactory {
   case RemoteCluster:
 resourceDefinition = new RemoteClusterResourceDefinition();
 break;
+  case AmbariConfiguration:
+resourceDefinition = new 
SimpleResourceDefinition(Resource.Type.AmbariConfiguration, 
"ambariconfiguration", "ambariconfigurations");
+
+break;
 
   default:
 throw new IllegalArgumentException("Unsupported resource type: " + 
type);

http://git-wip-us.apache.org/repos/asf/ambari/blob/529ac321/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
new file mode 100644
index 000..0fa6e44
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services;
+
+import java.util.Collections;
+
+import javax.ws.rs.DELETE;
+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;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.http.HttpStatus;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+
+/**
+ * Rest endpoint for managing ambari configurations. 

ambari git commit: AMBARI-21379. Ambari Agent doesn't start as non-root user with "ambari-agent start" logged in as root (aonishuk)

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 8ba5c3e3a -> 29203a15d


AMBARI-21379. Ambari Agent doesn't start as non-root user with "ambari-agent 
start" logged in as root (aonishuk)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 29203a15d7ca0a6e65eca8e1d641f49974e55cb8
Parents: 8ba5c3e
Author: Andrew Onishuk 
Authored: Wed Jul 5 14:25:48 2017 +0300
Committer: Andrew Onishuk 
Committed: Wed Jul 5 14:25:48 2017 +0300

--
 ambari-agent/etc/init.d/ambari-agent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/29203a15/ambari-agent/etc/init.d/ambari-agent
--
diff --git a/ambari-agent/etc/init.d/ambari-agent 
b/ambari-agent/etc/init.d/ambari-agent
index b70de85..dbaf147 100644
--- a/ambari-agent/etc/init.d/ambari-agent
+++ b/ambari-agent/etc/init.d/ambari-agent
@@ -36,6 +36,6 @@ else
   command_prefx="bash -c"
 fi
 
-$command_prefx "/var/lib/ambari-agent/bin/ambari-agent $@"
+eval "$command_prefx '/var/lib/ambari-agent/bin/ambari-agent $@'"
 
 exit $?

[24/26] ambari git commit: Revert "AMBARI-21344. Add Services Using Repository ID (alexantonenko)"

[lpuskas]

Revert "AMBARI-21344. Add Services Using Repository ID (alexantonenko)"

This reverts commit 08dd492e5fb801355be8e2dcd895d9cb09d3dd3c.


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 068f86a1c751a501acd78572a25c1d6e223e70e6
Parents: e666e9b
Author: Dmytro Grinenko 
Authored: Thu Jul 6 15:42:55 2017 +0300
Committer: Dmytro Grinenko 
Committed: Thu Jul 6 15:42:55 2017 +0300

--
 .../app/controllers/wizard/step8_controller.js  | 16 ++--
 ambari-web/app/models/stack.js  |  4 +---
 2 files changed, 11 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/068f86a1/ambari-web/app/controllers/wizard/step8_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index 42519e0..fa44a24 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -913,9 +913,6 @@ App.WizardStep8Controller = 
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
 
installerController.postVersionDefinitionFileStep8(versionData.isXMLdata, 
versionData.data).done(function (versionInfo) {
   if (versionInfo.id && versionInfo.stackName && 
versionInfo.stackVersion) {
 var selectedStack = App.Stack.find().findProperty('isSelected', 
true);
-if (selectedStack) {
-  selectedStack.set('versionInfoId', versionInfo.id);
-}
 installerController.updateRepoOSInfo(versionInfo, 
selectedStack).done(function() {
   self._startDeploy();
 });
@@ -1014,13 +1011,20 @@ App.WizardStep8Controller = 
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
* @method createSelectedServicesData
*/
   createSelectedServicesData: function () {
+
+var isInstaller = this.get('isInstaller')
 var selectedStack;
 if (this.get('isInstaller')) {
   selectedStack = App.Stack.find().findProperty('isSelected', true);
 }
-return this.get('selectedServices').map(service => selectedStack ?
-  {"ServiceInfo": { "service_name": service.get('serviceName'), 
"desired_repository_version_id": selectedStack.get('versionInfoId') }} :
-  {"ServiceInfo": { "service_name": service.get('serviceName') }});
+
+return this.get('selectedServices').map(function (_service) {
+  if (selectedStack) {
+return {"ServiceInfo": { "service_name": _service.get('serviceName'), 
"desired_repository_version": selectedStack.get('repositoryVersion') }};
+  } else {
+return {"ServiceInfo": { "service_name": _service.get('serviceName') 
}};
+  }
+});
   },
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/068f86a1/ambari-web/app/models/stack.js
--
diff --git a/ambari-web/app/models/stack.js b/ambari-web/app/models/stack.js
index 657ee5c..47d1c44 100644
--- a/ambari-web/app/models/stack.js
+++ b/ambari-web/app/models/stack.js
@@ -34,8 +34,6 @@ App.Stack = DS.Model.extend({
   operatingSystems: DS.hasMany('App.OperatingSystem'),
   isSelected: DS.attr('boolean', {defaultValue: false}),
 
-  versionInfoId: null,
-
   stackNameVersion: Em.computed.concat('-', 'stackName', 'stackVersion'),
 
   isPatch: Em.computed.equal('type', 'PATCH'),
@@ -83,4 +81,4 @@ App.Stack = DS.Model.extend({
 });
 
 
-App.Stack.FIXTURES = [];
+App.Stack.FIXTURES = [];
\ No newline at end of file

[02/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/themes/theme_version_1.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/themes/theme_version_1.json
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/themes/theme_version_1.json
new file mode 100644
index 000..848f10b
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/themes/theme_version_1.json
@@ -0,0 +1,409 @@
+{
+  "name": "default",
+  "description": "Default theme for Ranger KMS service",
+  "configuration": {
+"layouts": [
+{
+"name": "default",
+"tabs": [
+  {
+"name": "db_settings",
+"display-name": "Settings",
+"layout": {
+  "tab-columns": "2",
+  "tab-rows": "2",
+  "sections": [
+{
+  "name": "section-db-settings",
+  "display-name": "",
+  "row-index": "0",
+  "column-index": "0",
+  "row-span": "4",
+  "column-span": "2",
+  "section-columns": "2",
+  "section-rows": "4",
+  "subsections": [
+{
+  "name": "subsection-kms-db-row1-col1",
+  "display-name": "Ranger KMS DB",
+  "row-index": "0",
+  "column-index": "0",
+  "row-span": "1",
+  "column-span": "1"
+},
+{
+  "name": "subsection-kms-db-row1-col2",
+  "row-index": "0",
+  "column-index": "1",
+  "row-span": "1",
+  "column-span": "1"
+},
+{
+  "name": "subsection-kms-create-db-user-row2-col",
+  "display-name": "Setup Database and Database User",
+  "row-index": "1",
+  "column-index": "0",
+  "row-span": "1",
+  "column-span": "2"
+},
+{
+  "name": "subsection-kms-db-root-user-row3-col1",
+  "display-name": "Ranger KMS Root DB",
+  "row-index": "2",
+  "column-index": "0",
+  "row-span": "1",
+  "column-span": "1",
+  "depends-on": [
+{
+  "configs":[
+"kms-env/create_db_user"
+  ],
+  "if": "${kms-env/create_db_user}",
+  "then": {
+"property_value_attributes": {
+  "visible": true
+}
+  },
+  "else": {
+"property_value_attributes": {
+  "visible": false
+}
+  }
+}
+  ]
+},
+{
+  "name": "subsection-kms-db-root-user-row3-col2",
+  "row-index": "2",
+  "column-index": "1",
+  "row-span": "1",
+  "column-span": "1",
+  "depends-on": [
+{
+  "configs":[
+"kms-env/create_db_user"
+  ],
+  "if": "${kms-env/create_db_user}",
+  "then": {
+"property_value_attributes": {
+  "visible": true
+}
+  },
+  "else": {
+"property_value_attributes": {
+  "visible": false
+}
+  }
+}
+  ]
+},
+{
+  "name": "subsection-kms-master-row4-col",
+  "display-name": "KMS Master Secret Password",
+  "row-index": "3",
+  "column-index": "0",
+  "row-span": "1",
+  "column-span": "2"
+}
+  ]
+}
+  ]
+}
+  },
+  {
+"name": "kms_hsm",
+"display-name": "KMS HSM",
+"layout": {
+  "tab-columns": 

[09/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/setup_ranger_xml.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/setup_ranger_xml.py
 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/setup_ranger_xml.py
new file mode 100644
index 000..c84ae96
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/setup_ranger_xml.py
@@ -0,0 +1,853 @@
+#!/usr/bin/env python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+"""
+import os
+import re
+from resource_management.libraries.script import Script
+from resource_management.libraries.functions.default import default
+from resource_management.core.logger import Logger
+from resource_management.core.resources.system import File, Directory, 
Execute, Link
+from resource_management.core.source import DownloadSource, InlineTemplate, 
Template
+from resource_management.libraries.resources.xml_config import XmlConfig
+from resource_management.libraries.resources.modify_properties_file import 
ModifyPropertiesFile
+from resource_management.libraries.resources.properties_file import 
PropertiesFile
+from resource_management.core.exceptions import Fail
+from resource_management.libraries.functions.decorator import retry
+from resource_management.libraries.functions.format import format
+from resource_management.libraries.functions.is_empty import is_empty
+from resource_management.core.utils import PasswordString
+from resource_management.core.shell import as_sudo
+from resource_management.libraries.functions import solr_cloud_util
+from ambari_commons.constants import UPGRADE_TYPE_NON_ROLLING, 
UPGRADE_TYPE_ROLLING
+from resource_management.core.exceptions import ExecutionFailed
+
+# This file contains functions used for setup/configure of Ranger Admin and 
Ranger Usersync.
+# The design is to mimic what is done by the setup.sh script bundled by Ranger 
component currently.
+
+def ranger(name=None, upgrade_type=None):
+  """
+  parameter name: name of ranger service component
+  """
+  if name == 'ranger_admin':
+setup_ranger_admin(upgrade_type=upgrade_type)
+
+  if name == 'ranger_usersync':
+setup_usersync(upgrade_type=upgrade_type)
+
+  if name == 'ranger_tagsync':
+setup_tagsync(upgrade_type=upgrade_type)
+
+def setup_ranger_admin(upgrade_type=None):
+  import params
+
+  if upgrade_type is None:
+upgrade_type = 
Script.get_upgrade_type(default("/commandParams/upgrade_type", ""))
+
+  ranger_home = params.ranger_home
+  ranger_conf = params.ranger_conf
+
+  Directory(ranger_conf,
+owner = params.unix_user,
+group = params.unix_group,
+create_parents = True
+  )
+
+  copy_jdbc_connector()
+
+  File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
+content = 
DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+mode = 0644,
+  )
+
+  cp = format("{check_db_connection_jar}")
+  if params.db_flavor.lower() == 'sqla':
+cp = cp + os.pathsep + format("{ranger_home}/ews/lib/sajdbc4.jar")
+  else:
+cp = cp + os.pathsep + format("{driver_curl_target}")
+  cp = cp + os.pathsep + format("{ranger_home}/ews/lib/*")
+
+  db_connection_check_command = format(
+"{java_home}/bin/java -cp {cp} 
org.apache.ambari.server.DBConnectionVerification 
'{ranger_jdbc_connection_url}' {ranger_db_user} {ranger_db_password!p} 
{ranger_jdbc_driver}")
+
+  env_dict = {}
+  if params.db_flavor.lower() == 'sqla':
+env_dict = {'LD_LIBRARY_PATH':params.ld_lib_path}
+
+  Execute(db_connection_check_command, 
path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin', tries=5, try_sleep=10, 
environment=env_dict)
+
+  Execute(('ln','-sf', 
format('{ranger_home}/ews/webapp/WEB-INF/classes/conf'), 
format('{ranger_home}/conf')),
+not_if=format("ls {ranger_home}/conf"),
+only_if=format("ls {ranger_home}/ews/webapp/WEB-INF/classes/conf"),
+sudo=True)
+
+  if upgrade_type is not None:
+src_file = 
format('{ranger_home}/ews/webapp/WEB-INF/classes/conf.dist/ranger-admin-default-site.xml')
+dst_file = 

[04/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/scripts/status_params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/scripts/status_params.py
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/scripts/status_params.py
deleted file mode 100644
index 34d0082..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/scripts/status_params.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management.libraries.script import Script
-from resource_management.libraries.functions.format import format
-from resource_management.libraries.functions.default import default
-from resource_management.libraries.functions.version import 
format_stack_version
-from resource_management.libraries.functions.stack_features import 
check_stack_feature
-from resource_management.libraries.functions import StackFeature
-
-config  = Script.get_config()
-tmp_dir = Script.get_tmp_dir()
-
-stack_name = default("/hostLevelParams/stack_name", None)
-stack_version_unformatted = config['hostLevelParams']['stack_version']
-stack_version_formatted = format_stack_version(stack_version_unformatted)
-stack_supports_pid = stack_version_formatted and 
check_stack_feature(StackFeature.RANGER_KMS_PID_SUPPORT, 
stack_version_formatted)
-ranger_kms_pid_dir = default("/configurations/kms-env/ranger_kms_pid_dir", 
"/var/run/ranger_kms")
-ranger_kms_pid_file = format('{ranger_kms_pid_dir}/rangerkms.pid')
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/scripts/upgrade.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/scripts/upgrade.py
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/scripts/upgrade.py
deleted file mode 100644
index 8478bb8..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/scripts/upgrade.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-from resource_management.core.resources.system import Execute
-from resource_management.libraries.functions import conf_select
-from resource_management.libraries.functions import stack_select
-from resource_management.libraries.functions.format import format
-
-def prestart(env, stack_component):
-  import params
-
-  if params.version and params.stack_supports_config_versioning:
-conf_select.select(params.stack_name, stack_component, params.version)
-stack_select.select(stack_component, params.version)

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/templates/input.config-ranger-kms.json.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/templates/input.config-ranger-kms.json.j2
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/package/templates/input.config-ranger-kms.json.j2
deleted file mode 100644
index 306fade..000

[21/26] ambari git commit: AMBARI-21399 Create property descriptions for internal Log Feeder configs (mgergely)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/5c9bdbfe/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/LogFeederUtil.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/LogFeederUtil.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/LogFeederUtil.java
index 0fdc21f..a244a4e 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/LogFeederUtil.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/LogFeederUtil.java
@@ -32,6 +32,7 @@ import java.util.Properties;
 
 import org.apache.ambari.logfeeder.LogFeeder;
 import org.apache.ambari.logfeeder.metrics.MetricData;
+import org.apache.ambari.logsearch.config.api.LogSearchPropertyDescription;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -46,6 +47,26 @@ import com.google.gson.reflect.TypeToken;
 public class LogFeederUtil {
   private static final Logger LOG = Logger.getLogger(LogFeederUtil.class);
 
+  public static final String LOGFEEDER_PROPERTIES_FILE = 
"logfeeder.properties";
+
+  @LogSearchPropertyDescription(
+name = "cluster.name",
+description = "The name of the cluster the Log Feeder program runs in.",
+examples = {"cl1"},
+sources = {LOGFEEDER_PROPERTIES_FILE}
+  )
+  private static final String CLUSTER_NAME_PROPERTY = "cluster.name";
+
+  private static final String DEFAULT_TMP_DIR = "/tmp/$username/logfeeder/";
+  @LogSearchPropertyDescription(
+name = "logfeeder.tmp.dir",
+description = "The tmp dir used for creating temporary files.",
+examples = {"/tmp/"},
+defaultValue = DEFAULT_TMP_DIR,
+sources = {LOGFEEDER_PROPERTIES_FILE}
+   )
+  private static final String TMP_DIR_PROPERTY = "logfeeder.tmp.dir";
+
   private final static String GSON_DATE_FORMAT = "-MM-dd HH:mm:ss.SSS";
   private static Gson gson = new 
GsonBuilder().setDateFormat(GSON_DATE_FORMAT).create();
   
@@ -81,6 +102,10 @@ public class LogFeederUtil {
 return props;
   }
 
+  public static void loadProperties() throws Exception {
+loadProperties(LOGFEEDER_PROPERTIES_FILE);
+  }
+  
   /**
* This method will read the properties from System, followed by propFile 
and finally from the map
*/
@@ -236,16 +261,20 @@ public class LogFeederUtil {
 }
   }
   
-  private static String logfeederTempDir = null;
+  public static String getClusterName() {
+return getStringProperty(CLUSTER_NAME_PROPERTY);
+  }
+  
+  private static String logFeederTempDir = null;
   
-  public synchronized static String getLogfeederTempDir() {
-if (logfeederTempDir == null) {
-  String tempDirValue = getStringProperty("logfeeder.tmp.dir", 
"/tmp/$username/logfeeder/");
+  public synchronized static String getLogFeederTempDir() {
+if (logFeederTempDir == null) {
+  String tempDirValue = getStringProperty(TMP_DIR_PROPERTY, 
DEFAULT_TMP_DIR);
   HashMap contextParam = new HashMap();
   String username = System.getProperty("user.name");
   contextParam.put("username", username);
-  logfeederTempDir = PlaceholderUtil.replaceVariables(tempDirValue, 
contextParam);
+  logFeederTempDir = PlaceholderUtil.replaceVariables(tempDirValue, 
contextParam);
 }
-return logfeederTempDir;
+return logFeederTempDir;
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/5c9bdbfe/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/LogfeederHDFSUtil.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/LogfeederHDFSUtil.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/LogfeederHDFSUtil.java
deleted file mode 100644
index c975b99..000
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/util/LogfeederHDFSUtil.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  

[20/26] ambari git commit: AMBARI-21387 Log Feeder input config attribute "tail" should be clearer (mgergely)

[lpuskas]

AMBARI-21387 Log Feeder input config attribute "tail" should be clearer 
(mgergely)

Change-Id: I0ca164df6b5b91d237f1503bc4b9e45a0df4b685


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 8d9fd451d5ad348d073d4adbe73970586ab71c37
Parents: 78ebbef
Author: Miklos Gergely 
Authored: Thu Jul 6 10:17:52 2017 +0200
Committer: Miklos Gergely 
Committed: Thu Jul 6 10:17:52 2017 +0200

--
 .../config/zookeeper/LogSearchConfigZK.java |  12 +-
 .../logfeeder/input/AbstractInputFile.java  | 105 +
 .../apache/ambari/logfeeder/input/Input.java|   4 -
 .../ambari/logfeeder/input/InputFile.java   |  23 ++--
 .../ambari/logfeeder/input/InputManager.java| 113 +++
 .../ambari/logfeeder/input/InputS3File.java |  11 +-
 .../logfeeder/input/InputManagerTest.java   |   1 -
 7 files changed, 152 insertions(+), 117 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8d9fd451/ambari-logsearch/ambari-logsearch-config-zookeeper/src/main/java/org/apache/ambari/logsearch/config/zookeeper/LogSearchConfigZK.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-config-zookeeper/src/main/java/org/apache/ambari/logsearch/config/zookeeper/LogSearchConfigZK.java
 
b/ambari-logsearch/ambari-logsearch-config-zookeeper/src/main/java/org/apache/ambari/logsearch/config/zookeeper/LogSearchConfigZK.java
index 1926efa..827101c 100644
--- 
a/ambari-logsearch/ambari-logsearch-config-zookeeper/src/main/java/org/apache/ambari/logsearch/config/zookeeper/LogSearchConfigZK.java
+++ 
b/ambari-logsearch/ambari-logsearch-config-zookeeper/src/main/java/org/apache/ambari/logsearch/config/zookeeper/LogSearchConfigZK.java
@@ -22,6 +22,7 @@ package org.apache.ambari.logsearch.config.zookeeper;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 import org.apache.ambari.logsearch.config.api.LogSearchConfig;
@@ -53,6 +54,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableSet;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
@@ -175,10 +177,14 @@ public class LogSearchConfigZK implements LogSearchConfig 
{
   globalConfigNode.add(globalConfigJson.getAsJsonObject().get("global"));
 }
 
-createGlobalConfigNode(globalConfigNode);
-
 TreeCacheListener listener = new TreeCacheListener() {
+  private final Set nodeEvents = ImmutableSet.of(Type.NODE_ADDED, 
Type.NODE_UPDATED, Type.NODE_REMOVED);
+  
   public void childEvent(CuratorFramework client, TreeCacheEvent event) 
throws Exception {
+if (!nodeEvents.contains(event.getType())) {
+  return;
+}
+
 String nodeName = ZKPaths.getNodeFromPath(event.getData().getPath());
 String nodeData = new String(event.getData().getData());
 Type eventType = event.getType();
@@ -265,6 +271,8 @@ public class LogSearchConfigZK implements LogSearchConfig {
 };
 cache.getListenable().addListener(listener);
 cache.start();
+
+createGlobalConfigNode(globalConfigNode);
   }
 
   private void createGlobalConfigNode(JsonArray globalConfigNode) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d9fd451/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/AbstractInputFile.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/AbstractInputFile.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/AbstractInputFile.java
index ab50eb7..2359256 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/AbstractInputFile.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/AbstractInputFile.java
@@ -31,7 +31,6 @@ import java.util.Map;
 import org.apache.ambari.logfeeder.util.FileUtil;
 import org.apache.ambari.logfeeder.util.LogFeederUtil;
 import 
org.apache.ambari.logsearch.config.api.model.inputconfig.InputFileBaseDescriptor;
-import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -48,11 

[22/26] ambari git commit: AMBARI-21399 Create property descriptions for internal Log Feeder configs (mgergely)

[lpuskas]

AMBARI-21399 Create property descriptions for internal Log Feeder configs 
(mgergely)

Change-Id: I51bf4322184da06084c1b2af35fedd6ee19ab36e


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 5c9bdbfeff7b5b78adf4d840fbd93c504f129830
Parents: 8d9fd45
Author: Miklos Gergely 
Authored: Thu Jul 6 11:08:48 2017 +0200
Committer: Miklos Gergely 
Committed: Thu Jul 6 11:08:48 2017 +0200

--
 .../logsearch/config/api/LogSearchConfig.java   |  7 +-
 .../config/api/LogSearchConfigFactory.java  |  8 +-
 .../config/api/LogSearchConfigClass1.java   |  6 +-
 .../config/api/LogSearchConfigClass2.java   |  6 +-
 .../config/api/LogSearchConfigFactoryTest.java  |  6 +-
 .../config/zookeeper/LogSearchConfigZK.java | 25 ++-
 .../org/apache/ambari/logfeeder/LogFeeder.java  | 34 ++---
 .../ambari/logfeeder/common/ConfigHandler.java  | 52 ++---
 .../logfeeder/common/LogFeederException.java| 31 
 .../logfeeder/common/LogfeederException.java| 31 
 .../apache/ambari/logfeeder/filter/Filter.java  |  6 +-
 .../ambari/logfeeder/filter/FilterGrok.java | 10 +--
 .../ambari/logfeeder/filter/FilterJSON.java |  6 +-
 .../ambari/logfeeder/filter/FilterKeyValue.java |  6 +-
 .../logfeeder/input/AbstractInputFile.java  |  3 +-
 .../apache/ambari/logfeeder/input/Input.java| 72 +++---
 .../logfeeder/input/InputConfigUploader.java| 18 -
 .../ambari/logfeeder/input/InputManager.java| 45 +++-
 .../ambari/logfeeder/input/InputSimulate.java   | 74 +--
 .../loglevelfilter/LogLevelFilterHandler.java   | 28 ++-
 .../logfeeder/metrics/LogFeederAMSClient.java   | 43 ++-
 .../logfeeder/metrics/MetricsManager.java   | 25 +--
 .../ambari/logfeeder/output/OutputHDFSFile.java | 10 +--
 .../ambari/logfeeder/output/OutputS3File.java   |  2 +-
 .../ambari/logfeeder/output/OutputSolr.java | 28 ++-
 .../apache/ambari/logfeeder/util/FileUtil.java  | 15 
 .../logfeeder/util/LogFeederHDFSUtil.java   | 77 
 .../ambari/logfeeder/util/LogFeederUtil.java| 41 +--
 .../logfeeder/util/LogfeederHDFSUtil.java   | 77 
 .../apache/ambari/logfeeder/util/SSLUtil.java   |  9 +++
 .../ambari/logfeeder/filter/FilterJSONTest.java |  8 +-
 .../logfeeder/input/InputManagerTest.java   | 26 ---
 .../logfeeder/metrics/MetricsManagerTest.java   |  2 -
 .../src/test/resources/logfeeder.properties |  1 -
 .../configurer/LogSearchConfigConfigurer.java   |  2 +-
 35 files changed, 500 insertions(+), 340 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5c9bdbfe/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfig.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfig.java
 
b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfig.java
index ad1f5d4..6c5cefd 100644
--- 
a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfig.java
+++ 
b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfig.java
@@ -43,9 +43,10 @@ public interface LogSearchConfig extends Closeable {
* 
* @param component The component which will use the configuration.
* @param properties The properties of that component.
+   * @param clusterName The name of the cluster, only need to be specified in 
LOGFEEDER mode (null for SERVER mode).
* @throws Exception
*/
-  void init(Component component, Map properties) throws 
Exception;
+  void init(Component component, Map properties, String 
clusterName) throws Exception;
 
   /**
* Returns all the service names with input configurations of a cluster. 
Will be used only in SERVER mode.
@@ -134,7 +135,9 @@ public interface LogSearchConfig extends Closeable {
* 
* @param inputConfigMonitor The input config monitor to call in case of an 
input config change.
* @param logLevelFilterMonitor The log level filter monitor to call in case 
of a log level filter change.
+   * @param clusterName The name of the cluster, only need to be specified in 
LOGFEEDER mode (null for SERVER mode).
* @throws Exception
*/
-  void 

[16/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/package/scripts/params.py
deleted file mode 100644
index 094d239..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/package/scripts/params.py
+++ /dev/null
@@ -1,448 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-import os
-from resource_management.libraries.script import Script
-from resource_management.libraries.functions.version import 
format_stack_version
-from resource_management.libraries.functions.format import format
-from resource_management.libraries.functions.default import default
-from resource_management.libraries.functions.is_empty import is_empty
-from resource_management.libraries.functions.constants import Direction
-from resource_management.libraries.functions.stack_features import 
check_stack_feature
-from resource_management.libraries.functions.stack_features import 
get_stack_feature_version
-from resource_management.libraries.functions import StackFeature
-from resource_management.libraries.functions.get_bare_principal import 
get_bare_principal
-
-# a map of the Ambari role to the component name
-# for use with /current/
-SERVER_ROLE_DIRECTORY_MAP = {
-  'RANGER_ADMIN' : 'ranger-admin',
-  'RANGER_USERSYNC' : 'ranger-usersync',
-  'RANGER_TAGSYNC' : 'ranger-tagsync'
-}
-
-component_directory = 
Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "RANGER_ADMIN")
-
-config  = Script.get_config()
-tmp_dir = Script.get_tmp_dir()
-stack_root = Script.get_stack_root()
-
-stack_name = default("/hostLevelParams/stack_name", None)
-version = default("/commandParams/version", None)
-
-stack_version_unformatted = config['hostLevelParams']['stack_version']
-stack_version_formatted = format_stack_version(stack_version_unformatted)
-
-upgrade_marker_file = format("{tmp_dir}/rangeradmin_ru.inprogress")
-
-xml_configurations_supported = 
config['configurations']['ranger-env']['xml_configurations_supported']
-
-create_db_dbuser = config['configurations']['ranger-env']['create_db_dbuser']
-
-# get the correct version to use for checking stack features
-version_for_stack_feature_checks = get_stack_feature_version(config)
-
-stack_supports_rolling_upgrade = 
check_stack_feature(StackFeature.ROLLING_UPGRADE, 
version_for_stack_feature_checks)
-stack_supports_config_versioning = 
check_stack_feature(StackFeature.CONFIG_VERSIONING, 
version_for_stack_feature_checks)
-stack_supports_usersync_non_root = 
check_stack_feature(StackFeature.RANGER_USERSYNC_NON_ROOT, 
version_for_stack_feature_checks)
-stack_supports_ranger_tagsync = 
check_stack_feature(StackFeature.RANGER_TAGSYNC_COMPONENT, 
version_for_stack_feature_checks)
-stack_supports_ranger_audit_db = 
check_stack_feature(StackFeature.RANGER_AUDIT_DB_SUPPORT, 
version_for_stack_feature_checks)
-stack_supports_ranger_log4j = 
check_stack_feature(StackFeature.RANGER_LOG4J_SUPPORT, 
version_for_stack_feature_checks)
-stack_supports_ranger_kerberos = 
check_stack_feature(StackFeature.RANGER_KERBEROS_SUPPORT, 
version_for_stack_feature_checks)
-stack_supports_usersync_passwd = 
check_stack_feature(StackFeature.RANGER_USERSYNC_PASSWORD_JCEKS, 
version_for_stack_feature_checks)
-stack_supports_infra_client = 
check_stack_feature(StackFeature.RANGER_INSTALL_INFRA_CLIENT, 
version_for_stack_feature_checks)
-stack_supports_pid = check_stack_feature(StackFeature.RANGER_PID_SUPPORT, 
version_for_stack_feature_checks)
-stack_supports_ranger_admin_password_change = 
check_stack_feature(StackFeature.RANGER_ADMIN_PASSWD_CHANGE, 
version_for_stack_feature_checks)
-stack_supports_ranger_setup_db_on_start = 
check_stack_feature(StackFeature.RANGER_SETUP_DB_ON_START, 
version_for_stack_feature_checks)
-stack_supports_ranger_tagsync_ssl_xml_support = 
check_stack_feature(StackFeature.RANGER_TAGSYNC_SSL_XML_SUPPORT, 
version_for_stack_feature_checks)
-stack_supports_ranger_solr_configs = 

[13/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/service_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/service_advisor.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/service_advisor.py
deleted file mode 100644
index 875fa30..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/service_advisor.py
+++ /dev/null
@@ -1,793 +0,0 @@
-#!/usr/bin/env ambari-python-wrap
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-
-# Python imports
-import imp
-import os
-import traceback
-import re
-import socket
-import fnmatch
-
-
-from resource_management.core.logger import Logger
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-STACKS_DIR = os.path.join(SCRIPT_DIR, '../../../stacks/')
-PARENT_FILE = os.path.join(STACKS_DIR, 'service_advisor.py')
-
-try:
-  with open(PARENT_FILE, 'rb') as fp:
-service_advisor = imp.load_module('service_advisor', fp, PARENT_FILE, 
('.py', 'rb', imp.PY_SOURCE))
-except Exception as e:
-  traceback.print_exc()
-  print "Failed to load parent"
-
-DB_TYPE_DEFAULT_PORT_MAP = {"MYSQL":"3306", "ORACLE":"1521", 
"POSTGRES":"5432", "MSSQL":"1433", "SQLA":"2638"}
-
-class RangerServiceAdvisor(service_advisor.ServiceAdvisor):
-
-  def __init__(self, *args, **kwargs):
-self.as_super = super(RangerServiceAdvisor, self)
-self.as_super.__init__(*args, **kwargs)
-
-# Always call these methods
-self.modifyMastersWithMultipleInstances()
-self.modifyCardinalitiesDict()
-self.modifyHeapSizeProperties()
-self.modifyNotValuableComponents()
-self.modifyComponentsNotPreferableOnServer()
-self.modifyComponentLayoutSchemes()
-
-  def modifyMastersWithMultipleInstances(self):
-"""
-Modify the set of masters with multiple instances.
-Must be overriden in child class.
-"""
-# Nothing to do
-pass
-
-  def modifyCardinalitiesDict(self):
-"""
-Modify the dictionary of cardinalities.
-Must be overriden in child class.
-"""
-# Nothing to do
-pass
-
-  def modifyHeapSizeProperties(self):
-"""
-Modify the dictionary of heap size properties.
-Must be overriden in child class.
-"""
-pass
-
-  def modifyNotValuableComponents(self):
-"""
-Modify the set of components whose host assignment is based on other 
services.
-Must be overriden in child class.
-"""
-# Nothing to do
-pass
-
-  def modifyComponentsNotPreferableOnServer(self):
-"""
-Modify the set of components that are not preferable on the server.
-Must be overriden in child class.
-"""
-# Nothing to do
-pass
-
-  def modifyComponentLayoutSchemes(self):
-"""
-Modify layout scheme dictionaries for components.
-The scheme dictionary basically maps the number of hosts to
-host index where component should exist.
-Must be overriden in child class.
-"""
-# Nothing to do
-pass
-
-  def getServiceComponentLayoutValidations(self, services, hosts):
-"""
-Get a list of errors.
-Must be overriden in child class.
-"""
-
-return []
-
-  def getServiceConfigurationRecommendations(self, configurations, 
clusterData, services, hosts):
-"""
-Entry point.
-Must be overriden in child class.
-"""
-#Logger.info("Class: %s, Method: %s. Recommending Service Configurations." 
%
-#(self.__class__.__name__, inspect.stack()[0][3]))
-
-recommender = RangerRecommender()
-recommender.recommendRangerConfigurationsFromHDP206(configurations, 
clusterData, services, hosts)
-recommender.recommendRangerConfigurationsFromHDP22(configurations, 
clusterData, services, hosts)
-recommender.recommendRangerConfigurationsFromHDP23(configurations, 
clusterData, services, hosts)
-recommender.recommendRangerConfigurationsFromHDP25(configurations, 
clusterData, services, hosts)
-recommender.recommendRangerConfigurationsFromHDP26(configurations, 
clusterData, services, hosts)
-
-
-
-  def getServiceConfigurationsValidationItems(self, configurations, 
recommendedDefaults, services, 

[18/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms 
(mugdha)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 3dc51b0c93bf130890f0f937b44d84f5017a
Parents: 19d4200
Author: Mugdha Varadkar 
Authored: Tue Jun 27 15:52:53 2017 +0530
Committer: Mugdha Varadkar 
Committed: Thu Jul 6 09:48:45 2017 +0530

--
 .../HDFS/3.0.0.3.0/service_advisor.py   |   53 +
 .../RANGER/0.7.0.3.0/alerts.json|   76 -
 .../0.7.0.3.0/configuration/admin-log4j.xml |  132 --
 .../configuration/admin-properties.xml  |  163 --
 .../configuration/atlas-tagsync-ssl.xml |   72 -
 .../configuration/ranger-admin-site.xml |  785 
 .../0.7.0.3.0/configuration/ranger-env.xml  |  513 -
 .../0.7.0.3.0/configuration/ranger-site.xml |   30 -
 .../configuration/ranger-solr-configuration.xml |   59 -
 .../ranger-tagsync-policymgr-ssl.xml|   72 -
 .../configuration/ranger-tagsync-site.xml   |  206 --
 .../configuration/ranger-ugsync-site.xml|  577 --
 .../tagsync-application-properties.xml  |   62 -
 .../0.7.0.3.0/configuration/tagsync-log4j.xml   |   90 -
 .../0.7.0.3.0/configuration/usersync-log4j.xml  |   89 -
 .../configuration/usersync-properties.xml   |   32 -
 .../RANGER/0.7.0.3.0/kerberos.json  |  153 --
 .../RANGER/0.7.0.3.0/metainfo.xml   |  189 --
 .../alerts/alert_ranger_admin_passwd_check.py   |  195 --
 .../RANGER/0.7.0.3.0/package/scripts/params.py  |  448 -
 .../0.7.0.3.0/package/scripts/ranger_admin.py   |  217 --
 .../0.7.0.3.0/package/scripts/ranger_service.py |   69 -
 .../0.7.0.3.0/package/scripts/ranger_tagsync.py |  139 --
 .../package/scripts/ranger_usersync.py  |  124 --
 .../0.7.0.3.0/package/scripts/service_check.py  |   49 -
 .../0.7.0.3.0/package/scripts/setup_ranger.py   |  153 --
 .../package/scripts/setup_ranger_xml.py |  853 
 .../0.7.0.3.0/package/scripts/status_params.py  |   39 -
 .../RANGER/0.7.0.3.0/package/scripts/upgrade.py |   31 -
 .../templates/input.config-ranger.json.j2   |   79 -
 .../package/templates/ranger_admin_pam.j2   |   22 -
 .../package/templates/ranger_remote_pam.j2  |   22 -
 .../package/templates/ranger_solr_jaas_conf.j2  |   26 -
 .../properties/ranger-solrconfig.xml.j2 | 1874 --
 .../RANGER/0.7.0.3.0/quicklinks/quicklinks.json |   41 -
 .../RANGER/0.7.0.3.0/role_command_order.json|9 -
 .../RANGER/0.7.0.3.0/service_advisor.py |  793 
 .../0.7.0.3.0/themes/theme_version_1.json   |  722 ---
 .../0.7.0.3.0/themes/theme_version_2.json   | 1470 --
 .../0.7.0.3.0/themes/theme_version_3.json   |  692 ---
 .../0.7.0.3.0/themes/theme_version_5.json   |   48 -
 .../RANGER/1.0.0.3.0/alerts.json|   76 +
 .../1.0.0.3.0/configuration/admin-log4j.xml |  132 ++
 .../configuration/admin-properties.xml  |  161 ++
 .../configuration/atlas-tagsync-ssl.xml |   72 +
 .../configuration/ranger-admin-site.xml |  751 +++
 .../1.0.0.3.0/configuration/ranger-env.xml  |  503 +
 .../configuration/ranger-solr-configuration.xml |   59 +
 .../ranger-tagsync-policymgr-ssl.xml|   72 +
 .../configuration/ranger-tagsync-site.xml   |  201 ++
 .../configuration/ranger-ugsync-site.xml|  571 ++
 .../tagsync-application-properties.xml  |   62 +
 .../1.0.0.3.0/configuration/tagsync-log4j.xml   |   90 +
 .../1.0.0.3.0/configuration/usersync-log4j.xml  |   89 +
 .../RANGER/1.0.0.3.0/kerberos.json  |  153 ++
 .../RANGER/1.0.0.3.0/metainfo.xml   |  177 ++
 .../alerts/alert_ranger_admin_passwd_check.py   |  195 ++
 .../RANGER/1.0.0.3.0/package/scripts/params.py  |  449 +
 .../1.0.0.3.0/package/scripts/ranger_admin.py   |  210 ++
 .../1.0.0.3.0/package/scripts/ranger_service.py |   69 +
 .../1.0.0.3.0/package/scripts/ranger_tagsync.py |  139 ++
 .../package/scripts/ranger_usersync.py  |  120 ++
 .../1.0.0.3.0/package/scripts/service_check.py  |   49 +
 .../package/scripts/setup_ranger_xml.py |  853 
 .../1.0.0.3.0/package/scripts/status_params.py  |   39 +
 .../RANGER/1.0.0.3.0/package/scripts/upgrade.py |   31 +
 .../templates/input.config-ranger.json.j2   |   79 +
 .../package/templates/ranger_admin_pam.j2   |   22 +
 .../package/templates/ranger_remote_pam.j2  |   22 +
 .../package/templates/ranger_solr_jaas_conf.j2  |   26 +
 .../properties/ranger-solrconfig.xml.j2 | 1874 ++
 

[17/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/configuration/ranger-tagsync-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/configuration/ranger-tagsync-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/configuration/ranger-tagsync-site.xml
deleted file mode 100644
index 5e60c06..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/configuration/ranger-tagsync-site.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-
-
-
-  
-ranger.tagsync.logdir
-/var/log/ranger/tagsync
-Ranger Log dir
-
-  directory
-  false
-  true
-
-
-  
-  
-ranger.tagsync.dest.ranger.endpoint
-{{ranger_external_url}}
-Ranger TagAdmin REST URL
-
-  true
-
-
-  
-  
-ranger.tagsync.source.atlas
-Enable Atlas Tag Source
-false
-
-
-  boolean
-
-
-  
-application-properties
-atlas.server.bind.address
-  
-
-
-  
-  
-ranger.tagsync.source.atlasrest
-Enable AtlasRest Tag Source
-false
-
-
-  boolean
-
-
-  
-  
-ranger.tagsync.source.file
-Enable File Tag Source
-false
-
-
-  boolean
-
-
-  
-  
-ranger.tagsync.source.file.check.interval.millis
-File Source: File update polling interval
-
-
-
-  true
-
-
-  
-  
-ranger.tagsync.source.atlasrest.download.interval.millis
-AtlasREST Source: Atlas source download 
interval
-6
-
-  true
-
-
-  
-
-  
-ranger.tagsync.source.file.filename
-File Source: Filename
-
-File Source Filename
-
-  true
-
-
-  
-
-  
-ranger.tagsync.source.atlasrest.endpoint
-AtlasREST Source: Atlas endpoint
-
-
-
-  true
-
-
-
-  
-application-properties
-atlas.server.http.port
-  
-  
-application-properties
-atlas.server.https.port
-  
-  
-application-properties
-atlas.enableTLS
-  
-
-  
-  
-ranger.tagsync.kerberos.principal
-
-
-KERBEROS_PRINCIPAL
-
-  true
-
-
-  
-  
-ranger.tagsync.kerberos.keytab
-
-
-
-  true
-
-
-  
-  
-ranger.tagsync.dest.ranger.username
-rangertagsync
-
-
-  
-
-  
-ranger.tagsync.source.atlasrest.username
-admin
-
-
-  
-
-  
-ranger.tagsync.atlas.default.cluster.name
-{{cluster_name}}
-Capture cluster name
-
-  true
-
-
-  
-
-  
-ranger.tagsync.keystore.filename
-/usr/hdp/current/ranger-tagsync/conf/rangertagsync.jceks
-Keystore file
-
-  true
-
-
-  
-  
-ranger.tagsync.source.atlasrest.keystore.filename
-/usr/hdp/current/ranger-tagsync/conf/atlasuser.jceks
-Tagsync atlasrest keystore file
-
-  true
-
-
-  
-  
-ranger.tagsync.dest.ranger.ssl.config.filename
-
{{stack_root}}/current/ranger-tagsync/conf/ranger-policymgr-ssl.xml
-Keystore and truststore information used for tagsync, 
required if tagsync - ranger admin communication is SSL 
enabled
-
-  
-  
-ranger.tagsync.source.atlasrest.ssl.config.filename
-
{{stack_root}}/current/ranger-tagsync/conf/atlas-tagsync-ssl.xml
-Keystore and truststore information used for tagsync, 
required if tagsync to atlas communication is SSL enabled
-
-  
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/configuration/ranger-ugsync-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/configuration/ranger-ugsync-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/configuration/ranger-ugsync-site.xml
deleted file mode 100644
index 922fbd8..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/configuration/ranger-ugsync-site.xml
+++ /dev/null
@@ -1,577 +0,0 @@
-
-
-
-  
-ranger.usersync.port
-5151
-Port for unix authentication service, run within 
usersync
-
-  
-  
-ranger.usersync.ssl
-true
-SSL enabled? (ranger admin - usersync 
communication)
-
-  
-
-  
-ranger.usersync.keystore.password
-UnIx529p
-PASSWORD
-Keystore password
-
-  password
-
-
-  
-
-  
-ranger.usersync.truststore.password
-changeit
-PASSWORD
-Truststore password
-
-  password
-
-
-  
-  
-ranger.usersync.passwordvalidator.path
-./native/credValidator.uexe
-Native program for password validation
-
-  
-  
-ranger.usersync.enabled
-Enable User Sync
-true
-Should users and groups be 

[10/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/usersync-log4j.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/usersync-log4j.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/usersync-log4j.xml
new file mode 100644
index 000..b5f2a7a
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/usersync-log4j.xml
@@ -0,0 +1,89 @@
+
+
+
+  
+ranger_usersync_log_maxfilesize
+256
+   The maximum size of backup file before the log is 
rotated
+Ranger usersync Log: backup file size
+
+  MB
+
+
+   
+   
+ranger_usersync_log_maxbackupindex
+20
+The number of backup files
+Ranger usersync Log: # of backup files
+
+  int
+  0
+
+
+  
+  
+content
+usersync-log4j template
+usersync-log4j.properties
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+log4j.rootLogger = info,logFile
+
+# logFile
+log4j.appender.logFile=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.logFile.file=${logdir}/usersync.log
+log4j.appender.logFile.datePattern='.'-MM-dd
+log4j.appender.logFile.layout=org.apache.log4j.PatternLayout
+log4j.appender.logFile.layout.ConversionPattern=%d{dd MMM  HH:mm:ss} %5p 
%c{1} [%t] - %m%n
+log4j.appender.logFile.MaxFileSize = {{ranger_usersync_log_maxfilesize}}MB
+log4j.appender.logFile.MaxBackupIndex = {{ranger_usersync_log_maxbackupindex}}
+
+# console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.Target=System.out
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{dd MMM  HH:mm:ss} %5p 
%c{1} [%t] - %m%n
+
+
+  content
+  false
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/kerberos.json
 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/kerberos.json
new file mode 100644
index 000..1fc8acf
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/kerberos.json
@@ -0,0 +1,153 @@
+{
+  "services": [
+{
+  "name": "RANGER",
+  "identities": [
+{
+  "name": "/spnego"
+},
+{
+  "name": "/smokeuser"
+}
+  ],
+  "configurations": [
+{
+  "ranger-admin-site": {
+"xasecure.audit.jaas.Client.loginModuleName": 
"com.sun.security.auth.module.Krb5LoginModule",
+"xasecure.audit.jaas.Client.loginModuleControlFlag": "required",
+"xasecure.audit.jaas.Client.option.useKeyTab": "true",
+"xasecure.audit.jaas.Client.option.storeKey": "false",
+"xasecure.audit.jaas.Client.option.serviceName": "solr"
+  }
+}
+  ],
+  "components": [
+{
+  "name": "RANGER_ADMIN",
+  "identities": [
+{
+  "name": "rangeradmin",
+  "principal": {
+"value": "rangeradmin/_HOST@${realm}",
+"type" : "service",
+"configuration": 
"ranger-admin-site/ranger.admin.kerberos.principal",
+"local_username" : "${ranger-env/ranger_user}"
+  },
+  "keytab": {
+"file": "${keytab_dir}/rangeradmin.service.keytab",
+"owner": {
+  "name": "${ranger-env/ranger_user}",
+  "access": "r"
+},
+"configuration": 
"ranger-admin-site/ranger.admin.kerberos.keytab"
+  }
+},
+{
+  "name": "rangerlookup",
+  "principal": {
+"value": "rangerlookup/_HOST@${realm}",
+"configuration": 

[19/26] ambari git commit: AMBARI-21374 : Replication factor should be configurable in Atlas to create solr collections (Vishal Suvagia via mugdha)

[lpuskas]

AMBARI-21374 : Replication factor should be configurable in Atlas to create 
solr collections (Vishal Suvagia via mugdha)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 78ebbef3db12b1261d71db361bc480a374f62e92
Parents: 3dc51b0
Author: Vishal Suvagia 
Authored: Mon Jul 3 10:44:43 2017 +0530
Committer: Mugdha Varadkar 
Committed: Thu Jul 6 10:44:50 2017 +0530

--
 .../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py  | 4 +++-
 .../ATLAS/0.7.0.3.0/configuration/atlas-env.xml| 6 ++
 .../common-services/ATLAS/0.7.0.3.0/package/scripts/params.py  | 4 +++-
 .../stacks/HDP/2.6/services/ATLAS/configuration/atlas-env.xml  | 6 ++
 4 files changed, 18 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/78ebbef3/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index 111a248..0c84b5c 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -212,7 +212,9 @@ search_backend_solr = 
atlas_search_backend.startswith('solr')
 infra_solr_znode = default("/configurations/infra-solr-env/infra_solr_znode", 
None)
 infra_solr_hosts = default("/clusterHostInfo/infra_solr_hosts", [])
 infra_solr_replication_factor = 2 if len(infra_solr_hosts) > 1 else 1
-atlas_solr_shards = default("/configurations/atlas-env/atlas_solr-shards", 1)
+if 'atlas_solr_replication_factor' in config['configurations']['atlas-env']:
+  infra_solr_replication_factor = 
int(default("/configurations/atlas-env/atlas_solr_replication_factor", 1))
+atlas_solr_shards = default("/configurations/atlas-env/atlas_solr_shards", 1)
 has_infra_solr = len(infra_solr_hosts) > 0
 infra_solr_role_atlas = 
default('configurations/infra-solr-security-json/infra_solr_role_atlas', 
'atlas_user')
 infra_solr_role_dev = 
default('configurations/infra-solr-security-json/infra_solr_role_dev', 'dev')

http://git-wip-us.apache.org/repos/asf/ambari/blob/78ebbef3/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml
index c5a4fd6..f97ca98 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-env.xml
@@ -179,4 +179,10 @@
 
 
   
+  
+atlas_solr_replication_factor
+1
+Replication factor for the atlas solr 
collections.
+
+  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/78ebbef3/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
index d26df33..61b41d6 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py
@@ -211,7 +211,9 @@ search_backend_solr = 
atlas_search_backend.startswith('solr')
 infra_solr_znode = default("/configurations/infra-solr-env/infra_solr_znode", 
None)
 infra_solr_hosts = default("/clusterHostInfo/infra_solr_hosts", [])
 infra_solr_replication_factor = 2 if len(infra_solr_hosts) > 1 else 1
-atlas_solr_shards = default("/configurations/atlas-env/atlas_solr-shards", 1)
+if 'atlas_solr_replication_factor' in config['configurations']['atlas-env']:
+  infra_solr_replication_factor = 
int(default("/configurations/atlas-env/atlas_solr_replication_factor", 1))
+atlas_solr_shards = default("/configurations/atlas-env/atlas_solr_shards", 1)
 has_infra_solr = len(infra_solr_hosts) > 0
 infra_solr_role_atlas = 
default('configurations/infra-solr-security-json/infra_solr_role_atlas', 

[08/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/properties/ranger-solrconfig.xml.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/properties/ranger-solrconfig.xml.j2
 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/properties/ranger-solrconfig.xml.j2
new file mode 100644
index 000..a1975fd
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/properties/ranger-solrconfig.xml.j2
@@ -0,0 +1,1874 @@
+
+
+
+
+
+  
+
+  
+  5.2.0
+
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  ${solr.data.dir:}
+
+
+  
+  
+
+
+
+
+${solr.hdfs.home:}
+
+${solr.hdfs.confdir:}
+
+${solr.hdfs.blockcache.enabled:true}
+
+${solr.hdfs.blockcache.global:true}
+
+  
+
+  
+  
+
+  
+
+   
+ true
+ managed-schema
+   
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{ranger_audit_logs_merge_factor}}
+
+
+
+
+
+${solr.lock.type:native}
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+
+
+
+ true
+  
+
+
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+
+
+  ${solr.ulog.dir:}
+
+
+
+ 
+   ${solr.autoCommit.maxTime:15000}
+   false
+ 
+
+
+
+ 
+   ${solr.autoSoftCommit.maxTime:5000}
+ 
+
+
+
+
+
+
+  
+
+  
+  
+
+  
+  
+
+1024
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+true
+
+   
+   
+
+   
+   20
+
+   
+   200
+
+   
+
+
+  
+
+  
+
+
+  
+
+  static firstSearcher warming in solrconfig.xml
+
+  
+
+
+
+true
+
+
+2
+
+  
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  solr-data-config.xml
+
+  
+
+  
+  
+
+ 
+   explicit
+   10
+   text
+ 
+
+
+
+
+
+
+
+
+
+  
+  
+ 
+   explicit
+   json
+   true
+   text
+ 
+  
+
+
+  
+  
+ 
+   true
+   json
+   true
+ 
+  
+
+
+  
+  
+
+  explicit
+
+  
+  velocity
+  browse
+  layout
+
+  
+  edismax
+  *:*
+  10
+  *,score
+
+  
+  on
+  1
+
+  
+
+
+  
+
+  text
+  add-unknown-fields-to-the-schema
+
+  
+
+  
+  
+
+
+  
+
+  
+  
+
+  true
+  ignored_
+
+  
+  true
+  links
+  ignored_
+
+  
+
+
+  
+  
+
+
+  
+  
+
+  
+  
+  
+  
+
+  
+  
+  
+  
+
+  solrpingquery
+
+
+  all
+
+
+
+  
+
+  
+  
+
+ explicit
+ true
+
+  
+
+  
+  
+
+
+
+  
+
+  
+
+   
+  
+
+text_general
+
+
+
+
+
+  default
+  text
+  solr.DirectSolrSpellChecker
+  
+  internal
+  
+  0.5
+  
+  2
+  
+  1
+  
+  5
+  
+  4
+  
+  0.01
+  
+
+
+
+
+  wordbreak
+  solr.WordBreakSolrSpellChecker
+  name
+  true
+  true
+  10
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+  
+
+  text
+  
+  default
+  wordbreak
+  on
+  true
+  10
+  5
+  5
+  true
+  true
+  10
+  5
+
+
+  spellcheck
+
+  
+
+  
+
+  mySuggester
+  FuzzyLookupFactory  
+  DocumentDictionaryFactory 
+  cat
+  price
+  string
+
+  
+
+  
+
+  true
+  10
+
+
+  suggest
+
+  
+  
+  
+
+  
+  
+
+  text
+  true
+
+
+  tvComponent
+
+  
+
+  
+  
+
+  lingo
+
+  
+  org.carrot2.clustering.lingo.LingoClusteringAlgorithm
+
+  
+  clustering/carrot2
+
+
+
+
+  stc
+  org.carrot2.clustering.stc.STCClusteringAlgorithm
+
+
+
+
+  kmeans
+  org.carrot2.clustering.kmeans.BisectingKMeansClusteringAlgorithm
+
+  
+
+  
+  
+
+  true
+  true
+  
+  name
+  
+  id
+  
+  features
+  
+  true
+  
+  
+  
+  false
+
+  
+  edismax
+  
+text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
+  
+  *:*
+  10
+  *,score
+
+
+  clustering
+
+  
+
+  
+  
+
+  
+  
+ 
+  true
+  false
+
+
+  terms
+
+  
+
+
+  
+  
+
+string
+elevate.xml
+  
+
+  
+  
+
+  explicit
+  text
+
+
+  elevator
+
+  
+
+  
+  
+
+  
+  
+  
+
+  100
+
+  
+
+  
+  
+
+  
+  70
+  
+ 

[06/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/themes/theme_version_1.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/themes/theme_version_1.json
 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/themes/theme_version_1.json
new file mode 100644
index 000..a307f56
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/themes/theme_version_1.json
@@ -0,0 +1,1821 @@
+{
+  "name": "default",
+  "description": "Default theme for Ranger service",
+  "configuration": {
+"layouts": [
+  {
+"name": "default",
+"tabs": [
+  {
+"name": "ranger_admin_settings",
+"display-name": "Ranger Admin",
+"layout": {
+  "tab-columns": "2",
+  "tab-rows": "2",
+  "sections": [
+{
+  "name": "section-ranger-admin",
+  "display-name": "Ranger Admin",
+  "row-index": "0",
+  "column-index": "0",
+  "row-span": "3",
+  "column-span": "2",
+  "section-columns": "2",
+  "section-rows": "3",
+  "subsections": [
+{
+  "name": "subsection-ranger-db-row1-col1",
+  "row-index": "0",
+  "column-index": "0",
+  "row-span": "1",
+  "column-span": "1"
+},
+{
+  "name": "subsection-ranger-db-row1-col2",
+  "row-index": "0",
+  "column-index": "1",
+  "row-span": "1",
+  "column-span": "1"
+},
+{
+  "name": "subsection-ranger-db-row2",
+  "row-index": "1",
+  "column-index": "0",
+  "row-span": "1",
+  "column-span": "2"
+},
+{
+  "name": "subsection-ranger-db-root-user-col1",
+  "row-index": "2",
+  "column-index": "0",
+  "row-span": "1",
+  "column-span": "1",
+  "depends-on": [
+{
+  "configs":[
+"ranger-env/create_db_dbuser"
+  ],
+  "if": "${ranger-env/create_db_dbuser}",
+  "then": {
+"property_value_attributes": {
+  "visible": true
+}
+  },
+  "else": {
+"property_value_attributes": {
+  "visible": false
+}
+  }
+}
+  ]
+},
+{
+  "name": "subsection-ranger-db-root-user-col2",
+  "row-index": "2",
+  "column-index": "1",
+  "row-span": "1",
+  "column-span": "1",
+  "depends-on": [
+{
+  "configs":[
+"ranger-env/create_db_dbuser"
+  ],
+  "if": "${ranger-env/create_db_dbuser}",
+  "then": {
+"property_value_attributes": {
+  "visible": true
+}
+  },
+  "else": {
+"property_value_attributes": {
+  "visible": false
+}
+  }
+}
+  ]
+}
+  ]
+}
+  ]
+}
+  },
+  {
+"name": "ranger_user_info",
+"display-name": "Ranger User Info",
+"layout": {
+  "tab-columns": "1",
+  "tab-rows": "1",
+  "sections": [
+{
+  "name": "section-user-info",
+  "display-name": "Ranger User Info",
+  "row-index": "0",
+  "column-index": "0",
+  "row-span": "2",
+  "column-span": "1",
+  "section-columns": "1",
+  "section-rows": "2",
+  "subsections": [
+{
+  

[03/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/metainfo.xml
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/metainfo.xml
new file mode 100644
index 000..d328d89
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/metainfo.xml
@@ -0,0 +1,111 @@
+
+
+
+  2.0
+  
+
+  RANGER_KMS
+  Ranger KMS
+  Key Management Server
+  1.0.0.3.0
+  
+
+
+  RANGER_KMS_SERVER
+  Ranger KMS Server
+  MASTER
+  1+
+  true
+  
+scripts/kms_server.py
+PYTHON
+600
+  
+  
+
+  ranger_kms
+  true
+
+  
+  
+
+  HDFS/HDFS_CLIENT
+  host
+  
+true
+  
+
+  
+
+  
+
+
+  
+
+  redhat7,amazon2015,redhat6,suse11,suse12
+  
+
+  ranger_${stack_version}-kms
+
+  
+
+
+  debian7,ubuntu12,ubuntu14,ubuntu16
+  
+
+  ranger-${stack_version}-kms
+
+  
+
+  
+
+  
+kms-properties
+kms-site
+kms-log4j
+dbks-site
+ranger-kms-site
+ranger-kms-audit
+ranger-kms-policymgr-ssl
+ranger-kms-security
+  
+
+  
+scripts/service_check.py
+PYTHON
+300
+  
+
+  
+RANGER
+HDFS
+  
+
+  
+
+  theme_version_1.json
+  true
+
+  
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms.py
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms.py
new file mode 100755
index 000..6e4a171
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms.py
@@ -0,0 +1,675 @@
+#!/usr/bin/env python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+"""
+
+import sys
+import fileinput
+import os
+import ambari_simplejson as json # simplejson is much faster comparing to 
Python 2.6 json module and has the same functions set.
+import urllib2, base64, httplib
+from StringIO import StringIO as BytesIO
+from datetime import datetime
+from resource_management.core.resources.system import File, Directory, Execute
+from resource_management.libraries.resources.xml_config import XmlConfig
+from resource_management.libraries.resources.modify_properties_file import 
ModifyPropertiesFile
+from resource_management.core.source import DownloadSource, InlineTemplate
+from resource_management.core.exceptions import Fail
+from resource_management.core.logger import Logger
+from resource_management.libraries.functions.is_empty import is_empty
+from resource_management.libraries.functions.format import format
+from resource_management.libraries.functions.ranger_functions import 
Rangeradmin
+from resource_management.libraries.functions.ranger_functions_v2 import 
RangeradminV2
+from resource_management.libraries.functions.decorator import safe_retry
+from resource_management.core.utils import PasswordString
+from resource_management.core.shell import as_sudo
+import re
+import time
+import socket
+
+def password_validation(password, key):
+  import params
+  if password.strip() == "":
+raise Fail("Blank password is not allowed for {0} property. Please enter 
valid password.".format(key))
+  if re.search("[\\\`'\"]",password):
+raise Fail("{0} password contains one of the unsupported special 
characters like \" ' \ `".format(key))
+  else:
+Logger.info("Password 

[26/26] ambari git commit: AMBARI-21307 Rest resource for supporting ambari configurations

[lpuskas]

AMBARI-21307 Rest resource for supporting ambari configurations


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: abd5dff9378bb9b215161619166065d30331c769
Parents: 88cba7f
Author: lpuskas <lpus...@apache.org>
Authored: Wed Jul 5 14:20:18 2017 +0200
Committer: lpuskas <laszlo.pus...@sequenceiq.com>
Committed: Thu Jul 6 18:16:35 2017 +0200

--
 .../resources/ResourceInstanceFactoryImpl.java  |   4 +
 .../services/AmbariConfigurationService.java| 146 +++
 .../internal/AbstractProviderModule.java|   2 +-
 .../AmbariConfigurationResourceProvider.java| 247 +++
 .../internal/DefaultProviderModule.java |  26 +-
 .../ambari/server/controller/spi/Resource.java  |   5 +-
 .../server/orm/dao/AmbariConfigurationDAO.java  |  92 +++
 .../orm/entities/AmbariConfigurationEntity.java |  70 ++
 .../orm/entities/ConfigurationBaseEntity.java   | 159 
 .../authorization/RoleAuthorization.java|  95 +++
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  25 +-
 .../src/main/resources/META-INF/persistence.xml |   2 +
 12 files changed, 809 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/abd5dff9/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
index 96e288f..b4c57fc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
@@ -471,6 +471,10 @@ public class ResourceInstanceFactoryImpl implements 
ResourceInstanceFactory {
   case RemoteCluster:
 resourceDefinition = new RemoteClusterResourceDefinition();
 break;
+  case AmbariConfiguration:
+resourceDefinition = new 
SimpleResourceDefinition(Resource.Type.AmbariConfiguration, 
"ambariconfiguration", "ambariconfigurations");
+
+break;
 
   default:
 throw new IllegalArgumentException("Unsupported resource type: " + 
type);

http://git-wip-us.apache.org/repos/asf/ambari/blob/abd5dff9/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
new file mode 100644
index 000..0fa6e44
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services;
+
+import java.util.Collections;
+
+import javax.ws.rs.DELETE;
+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;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.http.HttpStatus;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+
+/**
+ * Rest endpoint for managing ambari configurations. Supports CRUD operations.
+ * Ambari configurations are resources that relate to the ambari server 

[01/26] ambari git commit: AMBARI-21364 DB consistency checker throws errors for missing 'parquet-logging' and 'product-info' configs after Ambari upgrade (dlysnichenko via dgrinenko) [Forced Update!]

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 529ac321d -> abd5dff93 (forced update)


AMBARI-21364 DB consistency checker throws errors for missing 'parquet-logging' 
and 'product-info' configs after Ambari upgrade (dlysnichenko via dgrinenko)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 19d4200e719854b0d304e0d7be5e20f33cda46ff
Parents: 29203a1
Author: Dmytro Grinenko 
Authored: Wed Jul 5 16:16:49 2017 +0300
Committer: Dmytro Grinenko 
Committed: Wed Jul 5 16:16:49 2017 +0300

--
 .../checks/DatabaseConsistencyCheckHelper.java   | 14 ++
 .../server/state/ClientConfigFileDefinition.java | 15 +--
 .../common-services/HIVE/0.12.0.2.0/metainfo.xml |  1 +
 .../common-services/HIVE/2.1.0.3.0/metainfo.xml  |  7 +++
 4 files changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/19d4200e/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index d1566d9..2559339 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
@@ -58,6 +58,8 @@ import 
org.apache.ambari.server.orm.entities.HostComponentDesiredStateEntity;
 import org.apache.ambari.server.orm.entities.HostComponentStateEntity;
 import org.apache.ambari.server.orm.entities.MetainfoEntity;
 import 
org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity;
+import org.apache.ambari.server.state.ClientConfigFileDefinition;
+import org.apache.ambari.server.state.ComponentInfo;
 import org.apache.ambari.server.state.SecurityState;
 import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.State;
@@ -1022,10 +1024,22 @@ public class DatabaseConsistencyCheckHelper {
 Multimap dbServiceConfigs = 
dbServiceVersionConfigs.get(serviceVersion);
 if (dbServiceConfigs != null) {
   for (String serviceName : dbServiceConfigs.keySet()) {
+ServiceInfo serviceInfo = serviceInfoMap.get(serviceName);
 Collection serviceConfigsFromStack = 
stackServiceConfigs.get(serviceName);
 Collection serviceConfigsFromDB = 
dbServiceConfigs.get(serviceName);
 if (serviceConfigsFromDB != null && serviceConfigsFromStack != 
null) {
   serviceConfigsFromStack.removeAll(serviceConfigsFromDB);
+  if (serviceInfo != null && serviceInfo.getComponents() != 
null) {
+for (ComponentInfo componentInfo : 
serviceInfo.getComponents()) {
+  if (componentInfo.getClientConfigFiles() != null) {
+for (ClientConfigFileDefinition 
clientConfigFileDefinition : componentInfo.getClientConfigFiles()) {
+  if (clientConfigFileDefinition.isOptional()) {
+
serviceConfigsFromStack.remove(clientConfigFileDefinition.getDictionaryName());
+  }
+}
+  }
+}
+  }
 
   // skip ranger-{service_name}-* from being checked, unless 
ranger is installed
   if(!dbServiceConfigs.containsKey("RANGER")) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/19d4200e/ambari-server/src/main/java/org/apache/ambari/server/state/ClientConfigFileDefinition.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ClientConfigFileDefinition.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ClientConfigFileDefinition.java
index 8c97473..354d4d3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ClientConfigFileDefinition.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ClientConfigFileDefinition.java
@@ -32,6 +32,15 @@ public class ClientConfigFileDefinition {
   private String type;
   private String fileName;
   private String dictionaryName;
+  private boolean optional = false;
+
+  public boolean isOptional() {
+  

[05/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/configuration/kms-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/configuration/kms-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/configuration/kms-site.xml
deleted file mode 100644
index 1e6f7b5..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/configuration/kms-site.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-  
-hadoop.kms.key.provider.uri
-dbks://http@localhost:9292/kms
-URI of the backing KeyProvider for the KMS.
-
-  
-  
-hadoop.security.keystore.JavaKeyStoreProvider.password
-none
-If using the JavaKeyStoreProvider, the password for the 
keystore file.
-
-  
-  
-hadoop.kms.cache.enable
-true
-Whether the KMS will act as a cache for the backing 
KeyProvider. When the cache is enabled, operations like getKeyVersion, 
getMetadata, and getCurrentKey will sometimes return cached data without 
consulting the backing KeyProvider. Cached values are flushed when keys are 
deleted or modified.
-
-
-  
-  
-hadoop.kms.cache.timeout.ms
-60
-Expiry time for the KMS key version and key metadata cache, 
in milliseconds. This affects getKeyVersion and getMetadata.
-
-
-  
-  
-hadoop.kms.current.key.cache.timeout.ms
-3
-Expiry time for the KMS current key cache, in milliseconds. 
This affects getCurrentKey operations.
-
-  
-  
-hadoop.kms.audit.aggregation.window.ms
-1
-Duplicate audit log events within the aggregation window 
(specified in ms) are quashed to reduce log traffic. A single message for 
aggregated events is printed at the end of the window, along with a count of 
the number of aggregated events.
-
-  
-  
-hadoop.kms.authentication.type
-simple
-Authentication type for the KMS. Can be either "simple" or 
"kerberos".
-
-
-  
-  
-hadoop.kms.authentication.kerberos.keytab
-${user.home}/kms.keytab
-Path to the keytab with credentials for the configured 
Kerberos principal.
-
-  
-  
-hadoop.kms.authentication.kerberos.principal
-HTTP/localhost
-The Kerberos principal to use for the HTTP endpoint. The 
principal must start with 'HTTP/' as per the Kerberos HTTP SPNEGO 
specification.
-KERBEROS_PRINCIPAL
-
-  
-  
-hadoop.kms.authentication.kerberos.name.rules
-DEFAULT
-Rules used to resolve Kerberos principal names.
-
-  multiLine
-
-
-  
-  
-hadoop.kms.authentication.signer.secret.provider
-random
-Indicates how the secret to sign the authentication cookies 
will be stored. Options are 'random' (default), 'string' and 'zookeeper'. If 
using a setup with multiple KMS instances, 'zookeeper' should be used.
-
-
-  
-  
-
hadoop.kms.authentication.signer.secret.provider.zookeeper.path
-/hadoop-kms/hadoop-auth-signature-secret
-The Zookeeper ZNode path where the KMS instances will store 
and retrieve the secret from.
-
-  
-  
-
hadoop.kms.authentication.signer.secret.provider.zookeeper.connection.string
-#HOSTNAME#:#PORT#,...
-The Zookeeper connection string, a list of hostnames and port 
comma separated.
-
-  
-  
-
hadoop.kms.authentication.signer.secret.provider.zookeeper.auth.type
-kerberos
-The Zookeeper authentication type, 'none' or 'sasl' 
(Kerberos).
-
-  
-  
-
hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.keytab
-/etc/hadoop/conf/kms.keytab
-The absolute path for the Kerberos keytab with the 
credentials to connect to Zookeeper.
-
-  
-  
-
hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.principal
-kms/#HOSTNAME#
-The Kerberos service principal used to connect to 
Zookeeper.
-KERBEROS_PRINCIPAL
-
-  
-  
-hadoop.kms.security.authorization.manager
-
org.apache.ranger.authorization.kms.authorizer.RangerKmsAuthorizer
-
-
-  
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/configuration/ranger-kms-audit.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/configuration/ranger-kms-audit.xml
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/configuration/ranger-kms-audit.xml
deleted file mode 100644
index 526794e..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.3.0/configuration/ranger-kms-audit.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-  
-xasecure.audit.is.enabled
-true
-Is Audit enabled?
-
-  
-  
-xasecure.audit.destination.hdfs
-true
-Audit to HDFS
-Is 

[15/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/package/scripts/setup_ranger_xml.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/package/scripts/setup_ranger_xml.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/package/scripts/setup_ranger_xml.py
deleted file mode 100644
index 26e6578..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/package/scripts/setup_ranger_xml.py
+++ /dev/null
@@ -1,853 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-import os
-import re
-from resource_management.libraries.script import Script
-from resource_management.libraries.functions.default import default
-from resource_management.core.logger import Logger
-from resource_management.core.resources.system import File, Directory, 
Execute, Link
-from resource_management.core.source import DownloadSource, InlineTemplate, 
Template
-from resource_management.libraries.resources.xml_config import XmlConfig
-from resource_management.libraries.resources.modify_properties_file import 
ModifyPropertiesFile
-from resource_management.libraries.resources.properties_file import 
PropertiesFile
-from resource_management.core.exceptions import Fail
-from resource_management.libraries.functions.decorator import retry
-from resource_management.libraries.functions.format import format
-from resource_management.libraries.functions.is_empty import is_empty
-from resource_management.core.utils import PasswordString
-from resource_management.core.shell import as_sudo
-from resource_management.libraries.functions import solr_cloud_util
-from ambari_commons.constants import UPGRADE_TYPE_NON_ROLLING, 
UPGRADE_TYPE_ROLLING
-from resource_management.core.exceptions import ExecutionFailed
-
-# This file contains functions used for setup/configure of Ranger Admin and 
Ranger Usersync.
-# The design is to mimic what is done by the setup.sh script bundled by Ranger 
component currently.
-
-def ranger(name=None, upgrade_type=None):
-  """
-  parameter name: name of ranger service component
-  """
-  if name == 'ranger_admin':
-setup_ranger_admin(upgrade_type=upgrade_type)
-
-  if name == 'ranger_usersync':
-setup_usersync(upgrade_type=upgrade_type)
-
-  if name == 'ranger_tagsync':
-setup_tagsync(upgrade_type=upgrade_type)
-
-def setup_ranger_admin(upgrade_type=None):
-  import params
-
-  if upgrade_type is None:
-upgrade_type = 
Script.get_upgrade_type(default("/commandParams/upgrade_type", ""))
-
-  ranger_home = params.ranger_home
-  ranger_conf = params.ranger_conf
-
-  Directory(ranger_conf,
-owner = params.unix_user,
-group = params.unix_group,
-create_parents = True
-  )
-
-  copy_jdbc_connector()
-
-  File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-content = 
DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
-mode = 0644,
-  )
-
-  cp = format("{check_db_connection_jar}")
-  if params.db_flavor.lower() == 'sqla':
-cp = cp + os.pathsep + format("{ranger_home}/ews/lib/sajdbc4.jar")
-  else:
-cp = cp + os.pathsep + format("{driver_curl_target}")
-  cp = cp + os.pathsep + format("{ranger_home}/ews/lib/*")
-
-  db_connection_check_command = format(
-"{java_home}/bin/java -cp {cp} 
org.apache.ambari.server.DBConnectionVerification 
'{ranger_jdbc_connection_url}' {ranger_db_user} {ranger_db_password!p} 
{ranger_jdbc_driver}")
-
-  env_dict = {}
-  if params.db_flavor.lower() == 'sqla':
-env_dict = {'LD_LIBRARY_PATH':params.ld_lib_path}
-
-  Execute(db_connection_check_command, 
path='/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin', tries=5, try_sleep=10, 
environment=env_dict)
-
-  Execute(('ln','-sf', 
format('{ranger_home}/ews/webapp/WEB-INF/classes/conf'), 
format('{ranger_home}/conf')),
-not_if=format("ls {ranger_home}/conf"),
-only_if=format("ls {ranger_home}/ews/webapp/WEB-INF/classes/conf"),
-sudo=True)
-
-  if upgrade_type is not None:
-src_file = 
format('{ranger_home}/ews/webapp/WEB-INF/classes/conf.dist/ranger-admin-default-site.xml')
-dst_file = 

[14/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/properties/ranger-solrconfig.xml.j2
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/properties/ranger-solrconfig.xml.j2
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/properties/ranger-solrconfig.xml.j2
deleted file mode 100644
index 25dbb7a..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/properties/ranger-solrconfig.xml.j2
+++ /dev/null
@@ -1,1874 +0,0 @@
-
-
-
-
-
-  
-
-  
-  5.2.0
-
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  ${solr.data.dir:}
-
-
-  
-  
-
-
-
-
-${solr.hdfs.home:}
-
-${solr.hdfs.confdir:}
-
-${solr.hdfs.blockcache.enabled:true}
-
-${solr.hdfs.blockcache.global:true}
-
-  
-
-  
-  
-
-  
-
-   
- true
- managed-schema
-   
-
-
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{{ranger_audit_logs_merge_factor}}
-
-
-
-
-
-${solr.lock.type:native}
-
-
-
-
-
-
-  
-  
-  
-  
-  
-  
-
-
-
- true
-  
-
-
-  
-  
-  
-  
-  
-  
-
-  
-  
-
-
-
-  ${solr.ulog.dir:}
-
-
-
- 
-   ${solr.autoCommit.maxTime:15000}
-   false
- 
-
-
-
- 
-   ${solr.autoSoftCommit.maxTime:5000}
- 
-
-
-
-
-
-
-  
-
-  
-  
-
-  
-  
-
-1024
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-true
-
-   
-   
-
-   
-   20
-
-   
-   200
-
-   
-
-
-  
-
-  
-
-
-  
-
-  static firstSearcher warming in solrconfig.xml
-
-  
-
-
-
-true
-
-
-2
-
-  
-
-
-  
-  
-
-
-
-
-
-
-
-
-
-  
-
-  
-
-  
-
-  solr-data-config.xml
-
-  
-
-  
-  
-
- 
-   explicit
-   10
-   text
- 
-
-
-
-
-
-
-
-
-
-  
-  
- 
-   explicit
-   json
-   true
-   text
- 
-  
-
-
-  
-  
- 
-   true
-   json
-   true
- 
-  
-
-
-  
-  
-
-  explicit
-
-  
-  velocity
-  browse
-  layout
-
-  
-  edismax
-  *:*
-  10
-  *,score
-
-  
-  on
-  1
-
-  
-
-
-  
-
-  text
-  add-unknown-fields-to-the-schema
-
-  
-
-  
-  
-
-
-  
-
-  
-  
-
-  true
-  ignored_
-
-  
-  true
-  links
-  ignored_
-
-  
-
-
-  
-  
-
-
-  
-  
-
-  
-  
-  
-  
-
-  
-  
-  
-  
-
-  solrpingquery
-
-
-  all
-
-
-
-  
-
-  
-  
-
- explicit
- true
-
-  
-
-  
-  
-
-
-
-  
-
-  
-
-   
-  
-
-text_general
-
-
-
-
-
-  default
-  text
-  solr.DirectSolrSpellChecker
-  
-  internal
-  
-  0.5
-  
-  2
-  
-  1
-  
-  5
-  
-  4
-  
-  0.01
-  
-
-
-
-
-  wordbreak
-  solr.WordBreakSolrSpellChecker
-  name
-  true
-  true
-  10
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-  
-
-  text
-  
-  default
-  wordbreak
-  on
-  true
-  10
-  5
-  5
-  true
-  true
-  10
-  5
-
-
-  spellcheck
-
-  
-
-  
-   
-  mySuggester
-  FuzzyLookupFactory  
-  DocumentDictionaryFactory 
-  cat
-  price
-  string
-
-  
-
-  
-
-  true
-  10
-
-
-  suggest
-
-  
-  
-  
-
-  
-  
-
-  text
-  true
-
-
-  tvComponent
-
-  
-
-  
-  
-
-  lingo
-
-  
-  org.carrot2.clustering.lingo.LingoClusteringAlgorithm
-
-  
-  clustering/carrot2
-
-
-
-
-  stc
-  org.carrot2.clustering.stc.STCClusteringAlgorithm
-
-
-
-
-  kmeans
-  org.carrot2.clustering.kmeans.BisectingKMeansClusteringAlgorithm
-
-  
-
-  
-  
-
-  true
-  true
-  
-  name
-  
-  id
-  
-  features
-  
-  true
-  
-  
-  
-  false
-
-  
-  edismax
-  
-text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
-  
-  *:*
-  10
-  *,score
-
-
-  clustering
-
-  
-
-  
-  
-
-  
-  
- 
-  true
-  false
-
-
-  terms
-
-  
-
-
-  
-  
-
-string
-elevate.xml
-  
-
-  
-  
-
-  explicit
-  text
-
-
-  elevator
-
-  
-
-  
-  
-
-  
-  
-  
-
-  100
-
-  
-
-  
-  
-
-  
-  70
-  
-  

[11/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/atlas-tagsync-ssl.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/atlas-tagsync-ssl.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/atlas-tagsync-ssl.xml
new file mode 100644
index 000..d43c010
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/atlas-tagsync-ssl.xml
@@ -0,0 +1,72 @@
+
+
+
+  
+xasecure.policymgr.clientssl.keystore
+/etc/security/serverKeys/atlas-tagsync-keystore.jks
+Java Keystore files
+
+  
+
+  
+xasecure.policymgr.clientssl.keystore.password
+myKeyFilePassword
+PASSWORD
+password for keystore
+
+  password
+
+
+  
+
+  
+xasecure.policymgr.clientssl.truststore
+/etc/security/serverKeys/atlas-tagsync-mytruststore.jks
+java truststore file
+
+  
+
+  
+xasecure.policymgr.clientssl.truststore.password
+changeit
+PASSWORD
+java truststore password
+
+  password
+
+
+  
+
+  
+xasecure.policymgr.clientssl.keystore.credential.file
+jceks://file{{atlas_tagsync_credential_file}}
+java keystore credential file
+
+  
+
+  
+xasecure.policymgr.clientssl.truststore.credential.file
+jceks://file{{atlas_tagsync_credential_file}}
+java truststore credential file
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/ranger-admin-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/ranger-admin-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/ranger-admin-site.xml
new file mode 100644
index 000..e2b6c24
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/configuration/ranger-admin-site.xml
@@ -0,0 +1,751 @@
+
+
+
+  
+ranger.service.host
+{{ranger_host}}
+Host where ranger service to be installed
+
+  
+  
+ranger.service.http.enabled
+true
+HTTP enabled
+Enable HTTP
+
+  false
+  boolean
+
+
+  
+  
+ranger.service.http.port
+6080
+HTTP port
+
+  
+  
+ranger.service.https.port
+6182
+HTTPS port (if SSL is enabled)
+
+  
+  
+ranger.service.https.attrib.ssl.enabled
+false
+true/false, set to true if using SSL
+
+  false
+  boolean
+
+
+  
+  
+ranger.service.https.attrib.clientAuth
+want
+Needs to be set to want for two way SSL
+
+  
+  
+ranger.service.https.attrib.keystore.keyalias
+rangeradmin
+Alias for Ranger Admin key in keystore
+
+  
+  
+ranger.service.https.attrib.keystore.pass
+xasecure
+PASSWORD
+Password for keystore
+
+  password
+
+
+  
+  
+ranger.https.attrib.keystore.file
+/etc/security/serverKeys/ranger-admin-keystore.jks
+Ranger admin keystore (specify full path)
+
+  
+  
+ranger.externalurl
+{{ranger_external_url}}
+External URL
+URL to be used by clients to access ranger admin
+
+  false
+  false
+
+
+  
+  
+ranger.jpa.jdbc.driver
+com.mysql.jdbc.Driver
+Driver class name for a JDBC Ranger database
+JDBC driver class name. Example: For MySQL / MariaDB: 
com.mysql.jdbc.Driver, For Oracle: oracle.jdbc.OracleDriver
+
+  false
+
+
+  
+admin-properties
+DB_FLAVOR
+  
+
+
+  
+  
+ranger.jpa.jdbc.url
+jdbc:mysql://localhost
+JDBC connect string for a Ranger database
+JDBC connect string
+
+  false
+
+
+  
+admin-properties
+DB_FLAVOR
+  
+  
+admin-properties
+db_host
+  
+  
+admin-properties
+db_name
+  
+
+
+  
+  
+ranger.jpa.jdbc.user
+{{ranger_db_user}}
+JDBC user
+
+  
+  
+ranger.jpa.jdbc.password
+_
+PASSWORD
+JDBC password
+
+  password
+
+
+  
+  
+ranger.jpa.jdbc.credential.alias
+rangeradmin
+Alias name for storing JDBC password
+
+  
+  
+ranger.credential.provider.path
+/etc/ranger/admin/rangeradmin.jceks
+File for credential store, provide full file 
path
+
+  
+  
+ranger.audit.source.type
+solr
+db or solr, based on the audit destination used
+
+  
+ranger-env
+xasecure.audit.destination.solr
+  
+  
+ranger-env
+xasecure.audit.destination.db
+  
+
+
+  
+  
+ranger.audit.solr.urls
+
+Solr url for audit. Example: 

[12/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/themes/theme_version_2.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/themes/theme_version_2.json
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/themes/theme_version_2.json
deleted file mode 100644
index cbd27e4..000
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0.3.0/themes/theme_version_2.json
+++ /dev/null
@@ -1,1470 +0,0 @@
-{
-  "name": "default",
-  "description": "Default theme for Ranger service",
-  "configuration": {
-"layouts": [
-  {
-"name": "default",
-"tabs": [
-  {
-"name": "ranger_admin_settings",
-"display-name": "Ranger Admin",
-"layout": {
-  "tab-columns": "2",
-  "tab-rows": "2",
-  "sections": [
-{
-  "name": "section-ranger-admin",
-  "display-name": "Ranger Admin",
-  "row-index": "0",
-  "column-index": "0",
-  "row-span": "3",
-  "column-span": "2",
-  "section-columns": "2",
-  "section-rows": "3",
-  "subsections": [
-{
-  "name": "subsection-ranger-db-row1-col1",
-  "row-index": "0",
-  "column-index": "0",
-  "row-span": "1",
-  "column-span": "1"
-},
-{
-  "name": "subsection-ranger-db-row1-col2",
-  "row-index": "0",
-  "column-index": "1",
-  "row-span": "1",
-  "column-span": "1"
-},
-{
-  "name": "subsection-ranger-db-row2",
-  "row-index": "1",
-  "column-index": "0",
-  "row-span": "1",
-  "column-span": "2"
-},
-{
-  "name": "subsection-ranger-db-root-user-col1",
-  "row-index": "2",
-  "column-index": "0",
-  "row-span": "1",
-  "column-span": "1",
-  "depends-on": [
-{
-  "configs":[
-"ranger-env/create_db_dbuser"
-  ],
-  "if": "${ranger-env/create_db_dbuser}",
-  "then": {
-"property_value_attributes": {
-  "visible": true
-}
-  },
-  "else": {
-"property_value_attributes": {
-  "visible": false
-}
-  }
-}
-  ]
-},
-{
-  "name": "subsection-ranger-db-root-user-col2",
-  "row-index": "2",
-  "column-index": "1",
-  "row-span": "1",
-  "column-span": "1",
-  "depends-on": [
-{
-  "configs":[
-"ranger-env/create_db_dbuser"
-  ],
-  "if": "${ranger-env/create_db_dbuser}",
-  "then": {
-"property_value_attributes": {
-  "visible": true
-}
-  },
-  "else": {
-"property_value_attributes": {
-  "visible": false
-}
-  }
-}
-  ]
-}
-  ]
-}
-  ]
-}
-  },
-  {
-"name": "ranger_user_info",
-"display-name": "Ranger User Info",
-"layout": {
-  "tab-columns": "1",
-  "tab-rows": "1",
-  "sections": [
-{
-  "name": "section-user-info",
-  "display-name": "Ranger User Info",
-  "row-index": "0",
-  "column-index": "0",
-  "row-span": "2",
-  "column-span": "1",
-  "section-columns": "1",
-  "section-rows": "2",
-  "subsections": [
-{
-

[25/26] ambari git commit: AMBARI-21416 Unable to Click on Stack Installation Details During Installation. (atkach)

[lpuskas]

AMBARI-21416 Unable to Click on Stack Installation Details During Installation. 
(atkach)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 88cba7fbd1842c6e87eec010a00653bcedbfac65
Parents: 068f86a
Author: Andrii Tkach 
Authored: Thu Jul 6 17:58:28 2017 +0300
Committer: Andrii Tkach 
Committed: Thu Jul 6 18:10:22 2017 +0300

--
 .../main/admin/stack_and_upgrade_controller.js  | 16 +++-
 .../stack_upgrade/upgrade_version_box_view.js   |  2 +-
 .../admin/stack_and_upgrade_controller_test.js  | 40 +++-
 .../upgrade_version_box_view_test.js| 11 +++---
 4 files changed, 60 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/88cba7fb/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index c4f835d..f712eea 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -1699,11 +1699,25 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
*/
   showProgressPopup: function(version) {
 var popupTitle = 
Em.I18n.t('admin.stackVersions.details.install.hosts.popup.title').format(version.get('displayName'));
-var requestIds = App.get('testMode') ? [1] : 
App.db.get('repoVersionInstall', 'id');
+var requestIds = this.getRepoVersionInstallId();
 var hostProgressPopupController = 
App.router.get('highAvailabilityProgressPopupController');
 hostProgressPopupController.initPopup(popupTitle, requestIds, this);
   },
 
+  getRepoVersionInstallId: function() {
+if (App.get('testMode')) return [1];
+
+var requestIds = App.db.get('repoVersionInstall', 'id');
+var lastRepoVersionInstall = 
App.router.get('backgroundOperationsController.services').find(function(request)
 {
+  return request.get('name').startsWith('Install version');
+});
+if (!requestIds ||
+  (lastRepoVersionInstall && 
!requestIds.contains(lastRepoVersionInstall.get('id' {
+  requestIds = [lastRepoVersionInstall.get('id')];
+}
+return requestIds;
+  },
+
   /**
* reset upgradeState to NOT_REQUIRED when upgrade is COMPLETED
* and clean auxiliary data

http://git-wip-us.apache.org/repos/asf/ambari/blob/88cba7fb/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index 1af7d5c..3462b58 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -43,7 +43,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
   installProgress: function() {
 if (App.get('testMode')) return 100;
 
-var installRequest, requestIds = App.db.get('repoVersionInstall', 'id');
+var installRequest, requestIds = 
this.get('controller').getRepoVersionInstallId();
 if (requestIds) {
   installRequest = 
App.router.get('backgroundOperationsController.services').findProperty('id', 
requestIds[0]);
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/88cba7fb/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
--
diff --git 
a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js 
b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index b87714e..ca0c4e7 100644
--- 
a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ 
b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -3093,13 +3093,13 @@ describe('App.MainAdminStackAndUpgradeController', 
function() {
 beforeEach(function() {
   sinon.stub(App.router, 
'get').withArgs('highAvailabilityProgressPopupController').returns(mock);
   sinon.stub(mock, 'initPopup');
-  sinon.stub(App.db, 'get').returns([1]);
+  sinon.stub(controller, 'getRepoVersionInstallId').returns([1]);
 });
 
 afterEach(function() {
   App.router.get.restore();
   mock.initPopup.restore();
-  App.db.get.restore();
+ 

[07/26] ambari git commit: AMBARI-21058 HDP 3.0 - Changing common service version for Ranger & Ranger Kms (mugdha)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3dc51b0c/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/service_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/service_advisor.py
 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/service_advisor.py
new file mode 100644
index 000..f37261f
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/service_advisor.py
@@ -0,0 +1,774 @@
+#!/usr/bin/env ambari-python-wrap
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+# Python imports
+import imp
+import os
+import traceback
+import re
+import socket
+import fnmatch
+
+
+from resource_management.core.logger import Logger
+
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+STACKS_DIR = os.path.join(SCRIPT_DIR, '../../../stacks/')
+PARENT_FILE = os.path.join(STACKS_DIR, 'service_advisor.py')
+
+try:
+  with open(PARENT_FILE, 'rb') as fp:
+service_advisor = imp.load_module('service_advisor', fp, PARENT_FILE, 
('.py', 'rb', imp.PY_SOURCE))
+except Exception as e:
+  traceback.print_exc()
+  print "Failed to load parent"
+
+DB_TYPE_DEFAULT_PORT_MAP = {"MYSQL":"3306", "ORACLE":"1521", 
"POSTGRES":"5432", "MSSQL":"1433", "SQLA":"2638"}
+
+class RangerServiceAdvisor(service_advisor.ServiceAdvisor):
+
+  def __init__(self, *args, **kwargs):
+self.as_super = super(RangerServiceAdvisor, self)
+self.as_super.__init__(*args, **kwargs)
+
+# Always call these methods
+self.modifyMastersWithMultipleInstances()
+self.modifyCardinalitiesDict()
+self.modifyHeapSizeProperties()
+self.modifyNotValuableComponents()
+self.modifyComponentsNotPreferableOnServer()
+self.modifyComponentLayoutSchemes()
+
+  def modifyMastersWithMultipleInstances(self):
+"""
+Modify the set of masters with multiple instances.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  def modifyCardinalitiesDict(self):
+"""
+Modify the dictionary of cardinalities.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  def modifyHeapSizeProperties(self):
+"""
+Modify the dictionary of heap size properties.
+Must be overriden in child class.
+"""
+pass
+
+  def modifyNotValuableComponents(self):
+"""
+Modify the set of components whose host assignment is based on other 
services.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  def modifyComponentsNotPreferableOnServer(self):
+"""
+Modify the set of components that are not preferable on the server.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  def modifyComponentLayoutSchemes(self):
+"""
+Modify layout scheme dictionaries for components.
+The scheme dictionary basically maps the number of hosts to
+host index where component should exist.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  def getServiceComponentLayoutValidations(self, services, hosts):
+"""
+Get a list of errors.
+Must be overriden in child class.
+"""
+
+return []
+
+  def getServiceConfigurationRecommendations(self, configurations, 
clusterData, services, hosts):
+"""
+Entry point.
+Must be overriden in child class.
+"""
+# Logger.info("Class: %s, Method: %s. Recommending Service 
Configurations." %
+#(self.__class__.__name__, inspect.stack()[0][3]))
+
+recommender = RangerRecommender()
+recommender.recommendRangerConfigurationsFromHDP206(configurations, 
clusterData, services, hosts)
+recommender.recommendRangerConfigurationsFromHDP22(configurations, 
clusterData, services, hosts)
+recommender.recommendRangerConfigurationsFromHDP23(configurations, 
clusterData, services, hosts)
+recommender.recommendRangerConfigurationsFromHDP25(configurations, 
clusterData, services, hosts)
+recommender.recommendRangerConfigurationsFromHDP26(configurations, 
clusterData, services, hosts)
+
+  def getServiceConfigurationsValidationItems(self, configurations, 
recommendedDefaults, services, hosts):
+   

[1/2] ambari git commit: AMBARI-21307 Added new resource related changes to the db creation ddl-s [Forced Update!]

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 abd5dff93 -> 98ca64071 (forced update)


AMBARI-21307 Added new resource related changes to the db creation ddl-s


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 98ca640718db491e712e67f7b6d962635ebb082d
Parents: da25455
Author: lpuskas <lpus...@apache.org>
Authored: Thu Jul 6 18:15:18 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Thu Jul 6 18:26:25 2017 +0200

--
 .../AmbariConfigurationResourceProvider.java| 12 ++--
 .../server/orm/dao/AmbariConfigurationDAO.java  | 65 ++--
 .../apache/ambari/server/orm/dao/DaoUtils.java  | 13 +---
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  | 21 +++
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  | 20 ++
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 20 ++
 .../resources/Ambari-DDL-Postgres-CREATE.sql| 14 ++---
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 20 ++
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   | 20 ++
 9 files changed, 120 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/98ca6407/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
index 5e5af9e..e8f186d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
@@ -97,14 +97,14 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 }
   }
 
-  private static Set properties = Sets.newHashSet(
+  private static Set PROPERTIES = Sets.newHashSet(
 ResourcePropertyId.ID.getPropertyId(),
 ResourcePropertyId.TYPE.getPropertyId(),
 ResourcePropertyId.VERSION.getPropertyId(),
 ResourcePropertyId.VERSION_TAG.getPropertyId(),
 ResourcePropertyId.DATA.getPropertyId());
 
-  private static Map<Resource.Type, String> pkPropertyMap = 
Collections.unmodifiableMap(
+  private static Map<Resource.Type, String> PK_PROPERTY_MAP = 
Collections.unmodifiableMap(
 new HashMap<Resource.Type, String>() {{
   put(Resource.Type.AmbariConfiguration, 
ResourcePropertyId.ID.getPropertyId());
 }}
@@ -117,7 +117,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
   private Gson gson;
 
   protected AmbariConfigurationResourceProvider() {
-super(properties, pkPropertyMap);
+super(PROPERTIES, PK_PROPERTY_MAP);
 
setRequiredCreateAuthorizations(EnumSet.of(RoleAuthorization.AMBARI_MANAGE_CONFIGURATION));
 
setRequiredDeleteAuthorizations(EnumSet.of(RoleAuthorization.AMBARI_MANAGE_CONFIGURATION));
 
@@ -126,7 +126,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 
   @Override
   protected Set getPKPropertyIds() {
-return Sets.newHashSet("AmbariConfiguration/id");
+return Sets.newHashSet(ResourcePropertyId.ID.getPropertyId());
   }
 
   @Override
@@ -137,7 +137,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 AmbariConfigurationEntity ambariConfigurationEntity = 
getEntityFromRequest(request);
 
 LOGGER.info("Persisting new ambari configuration: {} ", 
ambariConfigurationEntity);
-ambariConfigurationDAO.persist(ambariConfigurationEntity);
+ambariConfigurationDAO.create(ambariConfigurationEntity);
 
 return getRequestStatus(null);
   }
@@ -170,7 +170,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 } else {
   LOGGER.debug("Deleting amari configuration with id: {}", idFromRequest);
   try {
-ambariConfigurationDAO.deleteById(idFromRequest);
+ambariConfigurationDAO.removeByPK(idFromRequest);
   } catch (IllegalStateException e) {
 throw new NoSuchResourceException(e.getMessage());
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/98ca6407/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java
--
diff --git 

ambari git commit: Added swagger annotations to the new endpoint

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 98ca64071 -> b4b586a10


Added swagger annotations to the new endpoint


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: b4b586a10b6b9a0c0d5c706d224f50a390278b5c
Parents: 98ca640
Author: Balázs Bence Sári <bs...@hortonworks.com>
Authored: Thu Jul 6 18:36:18 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Thu Jul 6 18:36:18 2017 +0200

--
 .../AmbariConfigurationRequestSwagger.java  | 48 +++
 .../AmbariConfigurationResponseSwagger.java | 40 +
 .../services/AmbariConfigurationService.java| 62 +---
 3 files changed, 143 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b4b586a1/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
new file mode 100644
index 000..d6714f9
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.api.services;
+
+import java.util.Map;
+
+import org.apache.ambari.server.controller.ApiModel;
+import org.apache.ambari.server.orm.entities.ConfigurationBaseEntity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Request data model for {@link 
org.apache.ambari.server.api.services.AmbariConfigurationService}
+ */
+public interface AmbariConfigurationRequestSwagger extends ApiModel {
+
+  @ApiModelProperty(name = "AmbariConfiguration")
+  AmbariConfigurationRequestInfo getAmbariConfiguration();
+
+  interface AmbariConfigurationRequestInfo {
+@ApiModelProperty
+Long getId();
+
+@ApiModelProperty
+Map<String, Object> getData();
+
+@ApiModelProperty
+String getType();
+
+@ApiModelProperty
+Long getVersion();
+
+@ApiModelProperty(name = "version_tag")
+String getVersionTag();
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/b4b586a1/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
new file mode 100644
index 000..c55ac1d
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.api.services;
+
+import java.util.Map;
+
+import org.apache.ambari.server.controller.ApiModel;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Response data model for {@link 
org.apache.ambari.server.api.services.AmbariConfigurationService}
+ */
+public interface AmbariConfigurationResponseSwagger extends ApiModel {
+
+  @ApiModelProperty(name = "AmbariConfiguration")
+  AmbariConfigurationRe

ambari git commit: AMBARI-20849 Set the default value for sun.security.krb5.debug to false

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 5dc3ba08b -> 064aef720


AMBARI-20849 Set the default value for sun.security.krb5.debug to false


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

Branch: refs/heads/branch-2.5
Commit: 064aef7202962b5ea9bb9bf57c2891dfb0595c37
Parents: 5dc3ba0
Author: lpuskas <lpus...@apache.org>
Authored: Wed Apr 26 14:27:56 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Thu Apr 27 15:19:10 2017 +0200

--
 .../common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/064aef72/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
index ad599e0..51036a0 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
@@ -58,7 +58,7 @@ limitations under the License.
   
   
 sun.security.krb5.debug
-true
+false
 Boolean flag indicating whether to enable debug messages for 
krb5 authentication
 
   

ambari git commit: AMBARI-20849 Set the default value for sun.security.krb5.debug to false

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/trunk e2f7301c6 -> dd572397c


AMBARI-20849 Set the default value for sun.security.krb5.debug to false


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

Branch: refs/heads/trunk
Commit: dd572397c1cb87bb03816bb654ff8b8cc48a9cef
Parents: e2f7301
Author: lpuskas <lpus...@apache.org>
Authored: Wed Apr 26 14:27:56 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Thu Apr 27 15:34:24 2017 +0200

--
 .../common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dd572397/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
index ad599e0..51036a0 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
@@ -58,7 +58,7 @@ limitations under the License.
   
   
 sun.security.krb5.debug
-true
+false
 Boolean flag indicating whether to enable debug messages for 
krb5 authentication
 
   

[ambari] Git Push Summary

[lpuskas]

Repository: ambari
Updated Branches:
  refs/remotes/origin/feature-branch-AMBARI-21307 [created] 9ad286791

[29/50] [abbrv] ambari git commit: AMBARI-21661 Services are not started for the correct count of nodes selected in the Hosts list. (ababiichuk)

[lpuskas]

AMBARI-21661 Services are not started for the correct count of nodes selected 
in the Hosts list. (ababiichuk)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: b175d8f697c8690e719c8a3f8dbcd20df073d2a6
Parents: 2258b10
Author: ababiichuk 
Authored: Fri Aug 4 16:37:10 2017 +0300
Committer: ababiichuk 
Committed: Fri Aug 4 18:12:04 2017 +0300

--
 ambari-web/app/controllers/main/host/bulk_operations_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b175d8f6/ambari-web/app/controllers/main/host/bulk_operations_controller.js
--
diff --git a/ambari-web/app/controllers/main/host/bulk_operations_controller.js 
b/ambari-web/app/controllers/main/host/bulk_operations_controller.js
index 34d61d8..bcd0af0 100644
--- a/ambari-web/app/controllers/main/host/bulk_operations_controller.js
+++ b/ambari-web/app/controllers/main/host/bulk_operations_controller.js
@@ -1115,7 +1115,7 @@ App.BulkOperationsController = Em.Controller.extend({
 // @todo remove using external controller
 switch(selection) {
   case 's':
-hostsNames = 
App.router.get('mainHostController.content').filterProperty('selected').mapProperty('hostName');
+hostsNames = App.db.getSelectedHosts('mainHostController');
 if(hostsNames.length > 0){
   queryParams.push({
 key: 'Hosts/host_name',

[15/50] [abbrv] ambari git commit: AMBARI-21497 Conflicts in the ambari config groups. (atkach)

[lpuskas]

AMBARI-21497 Conflicts in the ambari config groups. (atkach)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: b17225df413ee0f6e562769963df864c69a02821
Parents: 9e91639
Author: Andrii Tkach 
Authored: Thu Aug 3 11:35:30 2017 +0300
Committer: Andrii Tkach 
Committed: Thu Aug 3 11:35:30 2017 +0300

--
 .../app/mixins/common/configs/configs_saver.js  | 12 ++-
 .../mixins/common/configs/enhanced_configs.js   | 13 +++-
 .../mixins/common/configs/configs_saver_test.js | 21 
 .../common/configs/enhanced_configs_test.js | 13 +++-
 4 files changed, 56 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b17225df/ambari-web/app/mixins/common/configs/configs_saver.js
--
diff --git a/ambari-web/app/mixins/common/configs/configs_saver.js 
b/ambari-web/app/mixins/common/configs/configs_saver.js
index 4a4163e..dafee79 100644
--- a/ambari-web/app/mixins/common/configs/configs_saver.js
+++ b/ambari-web/app/mixins/common/configs/configs_saver.js
@@ -135,7 +135,7 @@ App.ConfigsSaverMixin = Em.Mixin.create({
   if (configGroup && !configGroup.get('isDefault')) {
 var overriddenConfigs = this.getConfigsForGroup(configs, 
configGroup.get('name'));
 
-if (Em.isArray(overriddenConfigs)) {
+if (Em.isArray(overriddenConfigs) && 
this.isOverriddenConfigsModified(overriddenConfigs)) {
   var successCallback = this.get('content.serviceName') === 
serviceName ? 'putConfigGroupChangesSuccess' : null;
   this.saveGroup(overriddenConfigs, configGroup, 
this.get('serviceConfigVersionNote'), successCallback);
 }
@@ -143,6 +143,16 @@ App.ConfigsSaverMixin = Em.Mixin.create({
 }, this);
   },
 
+  /**
+   * @param {Array} overriddenConfigs
+   * @returns {boolean}
+   */
+  isOverriddenConfigsModified: function(overriddenConfigs) {
+return overriddenConfigs.some(function(config) {
+  return config.get('savedValue') !== config.get('value');
+});
+  },
+
   saveConfigsForDefaultGroup: function() {
 var data = [];
 this.get('stepConfigs').forEach(function(stepConfig) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/b17225df/ambari-web/app/mixins/common/configs/enhanced_configs.js
--
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js 
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index a5af407..f870fc6 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -448,7 +448,7 @@ App.EnhancedConfigsMixin = 
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
 var configForGroup = recommendations['config-groups'][0];
 this.get('stepConfigs').forEach(function(stepConfig) {
   var configGroup = this.getGroupForService(stepConfig.get('serviceName'));
-  if (configGroup) {
+  if (configGroup && this.isConfigGroupAffected(configForGroup.hosts, 
configGroup.get('hosts'))) {
 this.updateOverridesByRecommendations(configForGroup.configurations, 
stepConfig.get('configs'), changedConfigs, configGroup);
 
this.updateOverridesByRecommendations(configForGroup.dependent_configurations, 
stepConfig.get('configs'), changedConfigs, configGroup);
 this.toggleProperty('forceUpdateBoundaries');
@@ -456,6 +456,17 @@ App.EnhancedConfigsMixin = 
Em.Mixin.create(App.ConfigWithOverrideRecommendationP
 }, this);
   },
 
+
+  /**
+   * determine whether hosts of group affected by config modifications
+   * @param {Array} affectedHosts
+   * @param {Array} groupHosts
+   * @returns {boolean}
+   */
+  isConfigGroupAffected: function(affectedHosts, groupHosts) {
+return _.intersection(affectedHosts, groupHosts).length > 0;
+  },
+
   /**
* method to show popup with dependent configs
* @method showChangedDependentConfigs

http://git-wip-us.apache.org/repos/asf/ambari/blob/b17225df/ambari-web/test/mixins/common/configs/configs_saver_test.js
--
diff --git a/ambari-web/test/mixins/common/configs/configs_saver_test.js 
b/ambari-web/test/mixins/common/configs/configs_saver_test.js
index 7815938..e8e03ea 100644
--- a/ambari-web/test/mixins/common/configs/configs_saver_test.js
+++ b/ambari-web/test/mixins/common/configs/configs_saver_test.js
@@ -408,12 +408,14 @@ describe('App.ConfigsSaverMixin', function() {
   

[06/50] [abbrv] ambari git commit: AMBARI-21632 Alerts list not sorted by status even though header displayed as sorted. (ababiichuk)

[lpuskas]

AMBARI-21632 Alerts list not sorted by status even though header displayed as 
sorted. (ababiichuk)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: c4a474a5c4912bec226b56c62c80b6d77ebb497b
Parents: ed08865
Author: ababiichuk 
Authored: Wed Aug 2 12:16:54 2017 +0300
Committer: ababiichuk 
Committed: Wed Aug 2 12:16:54 2017 +0300

--
 .../app/views/main/alert_definitions_view.js|  5 +-
 .../views/main/alert_definitions_view_test.js   | 69 
 2 files changed, 72 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c4a474a5/ambari-web/app/views/main/alert_definitions_view.js
--
diff --git a/ambari-web/app/views/main/alert_definitions_view.js 
b/ambari-web/app/views/main/alert_definitions_view.js
index a578c84..530bca7 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -28,10 +28,11 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 
   contentObs: function () {
 Em.run.once(this, this.contentObsOnce);
-  }.observes('controller.content.[]'),
+  }.observes('controller.content.[]', 
'App.router.clusterController.isAlertsLoaded'),
 
   contentObsOnce: function() {
-var content = this.get('controller.content') ? 
this.get('controller.content').toArray().sort(App.AlertDefinition.getSortDefinitionsByStatus(true))
 : [];
+var content = this.get('controller.content') && 
App.get('router.clusterController.isAlertsLoaded') ?
+  
this.get('controller.content').toArray().sort(App.AlertDefinition.getSortDefinitionsByStatus(true))
 : [];
 this.set('content', content);
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c4a474a5/ambari-web/test/views/main/alert_definitions_view_test.js
--
diff --git a/ambari-web/test/views/main/alert_definitions_view_test.js 
b/ambari-web/test/views/main/alert_definitions_view_test.js
index 8692ae4..edba415 100644
--- a/ambari-web/test/views/main/alert_definitions_view_test.js
+++ b/ambari-web/test/views/main/alert_definitions_view_test.js
@@ -436,4 +436,73 @@ describe('App.MainAlertDefinitionsView', function () {
   expect(view.tooltipsUpdater.calledOnce).to.be.true;
 });
   });
+
+  describe('#contentObsOnce', function () {
+var toArray = function () {
+return [{}];
+  },
+  cases = [
+{
+  controllerContent: null,
+  isAlertsLoaded: false,
+  content: [],
+  title: 'no content in controller, alerts data not loaded'
+},
+{
+  controllerContent: null,
+  isAlertsLoaded: true,
+  content: [],
+  title: 'no content in controller, alerts data loaded'
+},
+{
+  controllerContent: {
+toArray: toArray
+  },
+  isAlertsLoaded: false,
+  content: [],
+  title: 'content set in controller, alerts data not loaded'
+},
+{
+  controllerContent: {
+toArray: toArray
+  },
+  isAlertsLoaded: true,
+  content: [{}],
+  title: 'content set in controller, alerts data loaded'
+}
+  ];
+
+cases.forEach(function (item) {
+  describe(item.title, function () {
+beforeEach(function () {
+  var controller = {
+content: item.controllerContent
+  };
+  sinon.stub(App.AlertDefinition, 'getSortDefinitionsByStatus', 
function () {
+return Em.K;
+  });
+  sinon.stub(view, 'contentObs', Em.K);
+  sinon.stub(App, 'get', function (key) {
+if (key === 'router.clusterController.isAlertsLoaded') {
+  return item.isAlertsLoaded;
+}
+return Em.get(App, key);
+  });
+  view.set('controller', controller);
+  view.contentObsOnce();
+});
+
+afterEach(function () {
+  view.contentObs.restore();
+  App.get.restore();
+  App.AlertDefinition.getSortDefinitionsByStatus.restore();
+});
+
+it('view.content', function () {
+  expect(view.get('content')).to.eql(item.content);
+});
+  });
+});
+  });
+
 });

[20/50] [abbrv] ambari git commit: AMBARI-21643 - Annotate upgrade packs for scope (jonathanhurley)

[lpuskas]

AMBARI-21643 - Annotate upgrade packs for scope (jonathanhurley)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: b487b450ac9ff00a3be3b61a1399b710aa21a5d6
Parents: 66410e5
Author: Jonathan Hurley 
Authored: Thu Aug 3 08:26:57 2017 -0400
Committer: Jonathan Hurley 
Committed: Thu Aug 3 13:37:53 2017 -0400

--
 .../upgrades/upgrade_nonrolling_new_stack.xml   |   6 +-
 .../2.1.1/upgrades/upgrade_test_nonrolling.xml  |   4 +-
 .../api/services/WidgetLayoutService.java   |   1 -
 .../internal/UpgradeResourceProvider.java   |   4 +-
 .../upgrades/UpdateDesiredRepositoryAction.java | 189 +++
 .../upgrades/UpdateDesiredStackAction.java  | 189 ---
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml |   6 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml |   7 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |   7 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   7 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml |   1 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml |   1 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |   1 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml |   6 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |   6 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   6 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml |   1 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |   1 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml |   6 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   6 +-
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |   6 +-
 .../1.0/upgrades/nonrolling-upgrade-2.0.xml |   6 +-
 .../upgrades/UpgradeActionTest.java |   6 +-
 .../server/state/stack/UpgradePackTest.java |   4 +-
 .../upgrades/upgrade_nonrolling_new_stack.xml   |   6 +-
 .../2.1.1/upgrades/upgrade_test_nonrolling.xml  |   4 +-
 26 files changed, 247 insertions(+), 240 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b487b450/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml
--
diff --git 
a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml
 
b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml
index d0f3e16..a44759e 100644
--- 
a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml
+++ 
b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_nonrolling_new_stack.xml
@@ -237,9 +237,9 @@
 
 
 
-
-  
-
+
+  
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b487b450/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
--
diff --git 
a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
 
b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
index 9f57ca8..f7dd720 100644
--- 
a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
+++ 
b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test_nonrolling.xml
@@ -105,9 +105,9 @@
 
 
 
-
+
   
-
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b487b450/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
index 61167d6..0a3c720 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
@@ -69,7 +69,6 @@ public class WidgetLayoutService extends BaseService {
   @GET @ApiIgnore // until documented
   @Produces("text/plain")
   public Response getServices(String body, @Context HttpHeaders headers, 
@Context UriInfo ui) {
-System.out.println("###");
 return handleRequest(headers, body, ui, Request.Type.GET,
 createResource(null));
   }

[30/50] [abbrv] ambari git commit: AMBARI-21663. Livy2 should use the same keytab as Livy. (Bikas Saha via smohanty)

[lpuskas]

AMBARI-21663. Livy2 should use the same keytab as Livy. (Bikas Saha via 
smohanty)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: aa9e16d8928b95c555a1e5b966fe1cf86c15cf82
Parents: b175d8f
Author: Sumit Mohanty 
Authored: Fri Aug 4 15:03:24 2017 -0700
Committer: Sumit Mohanty 
Committed: Fri Aug 4 15:11:22 2017 -0700

--
 .../main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aa9e16d8/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
index 198ab41..0f99bbb 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json
@@ -96,7 +96,7 @@
 "local_username": "${livy2-env/livy2_user}"
   },
   "keytab": {
-"file": "${keytab_dir}/livy2.service.keytab",
+"file": "${keytab_dir}/livy.service.keytab",
 "owner": {
   "name": "${livy2-env/livy2_user}",
   "access": "r"

[08/50] [abbrv] ambari git commit: AMBARI-21581 - Replace Hard Coded conf-select Structures (jonathanhurley)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py 
b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
index f074036..4aa18de 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_client.py
@@ -197,19 +197,9 @@ class TestZookeeperClient(RMFTestCase):
config_overrides = self.CONFIG_OVERRIDES,
stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
-   call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
 
 self.assertResourceCalledIgnoreEarlier('Execute',
   ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'zookeeper-client', version), sudo=True)
 
-self.assertEquals(1, mocks_dict['call'].call_count)
-self.assertEquals(1, mocks_dict['checked_call'].call_count)
-self.assertEquals(
-  ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'zookeeper', '--stack-version', '2.3.0.0-3242', '--conf-version', 
'0'),
-   mocks_dict['checked_call'].call_args_list[0][0][0])
-self.assertEquals(
-  ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'zookeeper', '--stack-version', '2.3.0.0-3242', '--conf-version', 
'0'),
-   mocks_dict['call'].call_args_list[0][0][0])
-
 self.assertNoMoreResources()

http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py 
b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
index bc58e56..3cbfbd6 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
@@ -284,22 +284,10 @@ class TestZookeeperServer(RMFTestCase):
config_overrides = self.CONFIG_OVERRIDES,
stack_version = self.STACK_VERSION,
target = RMFTestCase.TARGET_COMMON_SERVICES,
-   call_mocks = [(0, None, ''), (0, None)],
mocks_dict = mocks_dict)
 
-self.assertResourceCalledIgnoreEarlier('Link', ('/etc/zookeeper/conf'), 
to='/etc/zookeeper/conf.backup')
 self.assertResourceCalled('Execute',
   ('ambari-python-wrap', '/usr/bin/hdp-select', 
'set', 'zookeeper-server', version), sudo=True)
-
-self.assertEquals(1, mocks_dict['call'].call_count)
-self.assertEquals(1, mocks_dict['checked_call'].call_count)
-self.assertEquals(
-  ('ambari-python-wrap', '/usr/bin/conf-select', 'set-conf-dir', 
'--package', 'zookeeper', '--stack-version', '2.3.0.0-3242', '--conf-version', 
'0'),
-   mocks_dict['checked_call'].call_args_list[0][0][0])
-self.assertEquals(
-  ('ambari-python-wrap', '/usr/bin/conf-select', 'create-conf-dir', 
'--package', 'zookeeper', '--stack-version', '2.3.0.0-3242', '--conf-version', 
'0'),
-   mocks_dict['call'].call_args_list[0][0][0])
-
 self.assertNoMoreResources()
 
   @patch.object(resource_management.libraries.functions, 
"get_unique_id_and_date")

http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
index caef738..f1da837 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
@@ -19,15 +19,26 @@ limitations under the License.
 '''
 
 import json
-from mock.mock import MagicMock, call, patch
+from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
+from resource_management.core.logger import Logger
 from resource_management.libraries.functions import conf_select
+from resource_management.libraries.script import Script
 
 @patch("os.path.exists", new = MagicMock(return_value=True))
 @patch("os.path.isfile", new = MagicMock(return_value=False))
 class TestHookAfterInstall(RMFTestCase):
   CONFIG_OVERRIDES = {"serviceName":"HIVE", "role":"HIVE_SERVER"}
 
+  def setUp(self):
+

[25/50] [abbrv] ambari git commit: AMBARI-21623 Log Search Config should be separated into a Server and Log Feeder interface (mgergely)

[lpuskas]

AMBARI-21623 Log Search Config should be separated into a Server and Log Feeder 
interface (mgergely)

Change-Id: Ie40cf3b57470c08375124d547dade2c9a3204e9f


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 2d1ac668b6ae272481668d08f4b7bd1c1b99fc45
Parents: 27386c3
Author: Miklos Gergely 
Authored: Fri Aug 4 11:27:57 2017 +0200
Committer: Miklos Gergely 
Committed: Fri Aug 4 11:27:57 2017 +0200

--
 .../logsearch/config/api/LogSearchConfig.java   | 131 -
 .../config/api/LogSearchConfigFactory.java  |  61 +++-
 .../config/api/LogSearchConfigLogFeeder.java|  77 +
 .../config/api/LogSearchConfigServer.java   | 111 +++
 .../config/api/LogSearchConfigClass1.java   |  95 --
 .../config/api/LogSearchConfigClass2.java   |  95 --
 .../config/api/LogSearchConfigFactoryTest.java  |  51 +++-
 .../api/LogSearchConfigLogFeederClass1.java |  58 
 .../api/LogSearchConfigLogFeederClass2.java |  58 
 .../config/api/LogSearchConfigServerClass1.java |  76 +
 .../config/api/LogSearchConfigServerClass2.java |  76 +
 .../zookeeper/LogSearchConfigLogFeederZK.java   | 228 +++
 .../zookeeper/LogSearchConfigServerZK.java  | 138 +
 .../config/zookeeper/LogSearchConfigZK.java | 291 +--
 .../org/apache/ambari/logfeeder/LogFeeder.java  |  11 +-
 .../ambari/logfeeder/common/ConfigHandler.java  |   6 +-
 .../logfeeder/input/InputConfigUploader.java|  10 +-
 .../apache/ambari/logfeeder/output/Output.java  |   6 +-
 .../ambari/logfeeder/output/OutputSolrTest.java |   6 +-
 .../configurer/LogSearchConfigConfigurer.java   |  13 +-
 .../configurer/SolrCollectionConfigurer.java|   3 +-
 .../ambari/logsearch/dao/SolrDaoBase.java   |  11 +-
 .../handler/CreateCollectionHandler.java|   7 +-
 .../logsearch/manager/ShipperConfigManager.java |  18 +-
 .../logsearch/model/common/LSServerFilter.java  |  10 +-
 25 files changed, 970 insertions(+), 677 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2d1ac668/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfig.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfig.java
 
b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfig.java
index 76be392..6c3b910 100644
--- 
a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfig.java
+++ 
b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfig.java
@@ -20,80 +20,14 @@
 package org.apache.ambari.logsearch.config.api;
 
 import java.io.Closeable;
-import java.util.List;
-import java.util.Map;
 
 import 
org.apache.ambari.logsearch.config.api.model.loglevelfilter.LogLevelFilter;
-import 
org.apache.ambari.logsearch.config.api.model.loglevelfilter.LogLevelFilterMap;
-import 
org.apache.ambari.logsearch.config.api.model.outputconfig.OutputSolrProperties;
-import org.apache.ambari.logsearch.config.api.model.inputconfig.InputConfig;
 
 /**
  * Log Search Configuration, which uploads, retrieves configurations, and 
monitors it's changes.
  */
 public interface LogSearchConfig extends Closeable {
   /**
-   * Enumeration of the components of the Log Search service.
-   */
-  public enum Component {
-SERVER, LOGFEEDER;
-  }
-
-  /**
-   * Initialization of the configuration.
-   * 
-   * @param component The component which will use the configuration.
-   * @param properties The properties of that component.
-   * @param clusterName The name of the cluster, only need to be specified in 
LOGFEEDER mode (null for SERVER mode).
-   * @throws Exception
-   */
-  void init(Component component, Map properties, String 
clusterName) throws Exception;
-
-  /**
-   * Returns all the service names with input configurations of a cluster. 
Will be used only in SERVER mode.
-   * 
-   * @param clusterName The name of the cluster which's services are required.
-   * @return List of the service names.
-   */
-  List getServices(String clusterName);
-
-  /**
-   * Checks if input configuration exists. Will be used only in LOGFEEDER mode.
-   * 
-   * @param serviceName The name of the service looked for.
-   * @return If input configuration exists for the service.
-   * @throws Exception
- 

[23/50] [abbrv] ambari git commit: AMBARI-21592 Log Feeder properties should be handled by one class (mgergely)

[lpuskas]

AMBARI-21592 Log Feeder properties should be handled by one class (mgergely)

Change-Id: I3193f3b7a4b7f64ed7d60191f446640500b46a0e


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 27386c3d9eae250a72f3b23308c752e5e32765c1
Parents: 98f15c9
Author: Miklos Gergely 
Authored: Fri Aug 4 11:03:51 2017 +0200
Committer: Miklos Gergely 
Committed: Fri Aug 4 11:03:51 2017 +0200

--
 .../org/apache/ambari/logfeeder/LogFeeder.java  |  10 +-
 .../ambari/logfeeder/common/ConfigHandler.java  |  27 +-
 .../logfeeder/input/AbstractInputFile.java  |   4 +-
 .../apache/ambari/logfeeder/input/Input.java|  70 +--
 .../logfeeder/input/InputConfigUploader.java|  17 +-
 .../ambari/logfeeder/input/InputManager.java|  28 +-
 .../ambari/logfeeder/input/InputSimulate.java   |  77 +--
 .../loglevelfilter/LogLevelFilterHandler.java   |  29 +-
 .../logfeeder/metrics/LogFeederAMSClient.java   |  45 +-
 .../ambari/logfeeder/output/OutputHDFSFile.java |   3 +-
 .../ambari/logfeeder/output/OutputS3File.java   |   3 +-
 .../ambari/logfeeder/output/OutputSolr.java |  39 +-
 .../logfeeder/util/LogFeederPropertiesUtil.java | 498 +++
 .../ambari/logfeeder/util/LogFeederUtil.java| 165 +-
 .../apache/ambari/logfeeder/util/SSLUtil.java   |  14 +-
 .../logconfig/LogConfigHandlerTest.java |   4 +-
 .../logfeeder/metrics/MetricsManagerTest.java   |   4 +-
 17 files changed, 575 insertions(+), 462 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/27386c3d/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java
index ba3412b..2461819 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java
@@ -36,7 +36,7 @@ import org.apache.ambari.logfeeder.input.InputConfigUploader;
 import org.apache.ambari.logfeeder.loglevelfilter.LogLevelFilterHandler;
 import org.apache.ambari.logfeeder.metrics.MetricData;
 import org.apache.ambari.logfeeder.metrics.MetricsManager;
-import org.apache.ambari.logfeeder.util.LogFeederUtil;
+import org.apache.ambari.logfeeder.util.LogFeederPropertiesUtil;
 import org.apache.ambari.logfeeder.util.SSLUtil;
 import com.google.common.collect.Maps;
 import com.google.gson.GsonBuilder;
@@ -80,13 +80,13 @@ public class LogFeeder {
 
 SSLUtil.ensureStorePasswords();
 
-config = LogSearchConfigFactory.createLogSearchConfig(Component.LOGFEEDER, 
Maps.fromProperties(LogFeederUtil.getProperties()),
-LogFeederUtil.getClusterName(), LogSearchConfigZK.class);
+config = 
LogSearchConfigFactory.createLogSearchConfig(Component.LOGFEEDER,Maps.fromProperties(LogFeederPropertiesUtil.getProperties()),
+LogFeederPropertiesUtil.getClusterName(), LogSearchConfigZK.class);
 configHandler = new ConfigHandler(config);
 configHandler.init();
 LogLevelFilterHandler.init(config);
 InputConfigUploader.load(config);
-config.monitorInputConfigChanges(configHandler, new 
LogLevelFilterHandler(), LogFeederUtil.getClusterName());
+config.monitorInputConfigChanges(configHandler, new 
LogLevelFilterHandler(), LogFeederPropertiesUtil.getClusterName());
 
 metricsManager.init();
 
@@ -182,7 +182,7 @@ public class LogFeeder {
 
 if (cli.isMonitor()) {
   try {
-LogFeederUtil.loadProperties();
+LogFeederPropertiesUtil.loadProperties();
   } catch (Throwable t) {
 LOG.warn("Could not load logfeeder properites");
 System.exit(1);

http://git-wip-us.apache.org/repos/asf/ambari/blob/27386c3d/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/ConfigHandler.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/ConfigHandler.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/ConfigHandler.java
index 30b61a1..11df9dc 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/ConfigHandler.java

[11/50] [abbrv] ambari git commit: AMBARI-21581 - Replace Hard Coded conf-select Structures (jonathanhurley)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat_server.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat_server.py
 
b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat_server.py
index 9bd5c6e..e3a4f36 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat_server.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/webhcat_server.py
@@ -19,7 +19,7 @@ Ambari Agent
 
 """
 from resource_management.libraries.script.script import Script
-from resource_management.libraries.functions import conf_select, stack_select
+from resource_management.libraries.functions import stack_select
 from resource_management.libraries.functions.constants import StackFeature
 from resource_management.libraries.functions.check_process_status import 
check_process_status
 from resource_management.libraries.functions.stack_features import 
check_stack_feature
@@ -77,8 +77,6 @@ class WebHCatServerDefault(WebHCatServer):
 
 if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, 
params.version): 
   # webhcat has no conf, but uses hadoop home, so verify that regular 
hadoop conf is set
-  conf_select.select(params.stack_name, "hive-hcatalog", params.version)
-  conf_select.select(params.stack_name, "hadoop", params.version)
   stack_select.select_packages(params.version)
 
   def get_log_folder(self):

http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka_broker.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka_broker.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka_broker.py
index 23fcaed..7ddd1ab 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka_broker.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/kafka_broker.py
@@ -19,7 +19,6 @@ limitations under the License.
 from resource_management import Script
 from resource_management.core.logger import Logger
 from resource_management.core.resources.system import Execute, File, Directory
-from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import stack_select
 from resource_management.libraries.functions import Direction
 from resource_management.libraries.functions.version import 
format_stack_version
@@ -51,9 +50,6 @@ class KafkaBroker(Script):
 if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, 
params.version):
   stack_select.select_packages(params.version)
 
-if params.version and check_stack_feature(StackFeature.CONFIG_VERSIONING, 
params.version):
-  conf_select.select(params.stack_name, "kafka", params.version)
-
 # This is extremely important since it should only be called if crossing 
the HDP 2.3.4.0 boundary. 
 if params.current_version and params.version and params.upgrade_direction:
   src_version = dst_version = None

http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
index 23fcaed..0910156 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
@@ -19,7 +19,6 @@ limitations under the License.
 from resource_management import Script
 from resource_management.core.logger import Logger
 from resource_management.core.resources.system import Execute, File, Directory
-from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import stack_select
 from resource_management.libraries.functions import Direction
 from resource_management.libraries.functions.version import 
format_stack_version
@@ -51,10 +50,7 @@ class KafkaBroker(Script):
 if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, 
params.version):
   stack_select.select_packages(params.version)
 
-if params.version and check_stack_feature(StackFeature.CONFIG_VERSIONING, 
params.version):
-  conf_select.select(params.stack_name, "kafka", params.version)
-
-# This is extremely 

[03/50] [abbrv] ambari git commit: AMBARI-21619. More ResourceManager HA host group placeholders in blueprints

[lpuskas]

AMBARI-21619. More ResourceManager HA host group placeholders in blueprints


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 0eee38e7cd612cb6d57352b32074beed9b115b39
Parents: 11aadf5
Author: Attila Doroszlai 
Authored: Tue Aug 1 14:22:37 2017 +0200
Committer: Attila Doroszlai 
Committed: Tue Aug 1 14:22:37 2017 +0200

--
 .../BlueprintConfigurationProcessor.java| 18 +--
 .../BlueprintConfigurationProcessorTest.java| 34 +---
 2 files changed, 31 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0eee38e7/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 46ace32..34102b6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -917,14 +917,14 @@ public class BlueprintConfigurationProcessor {
 Map yarnSiteConfig = 
clusterTopology.getConfiguration().getFullProperties().get("yarn-site");
 // generate the property names based on the current HA config for the 
ResourceManager deployments
 for (String resourceManager : parseResourceManagers(yarnSiteConfig)) {
-  final String rmHostPropertyName = "yarn.resourcemanager.hostname." + 
resourceManager;
-  yarnSiteUpdatersForAvailability.put(rmHostPropertyName, new 
SingleHostTopologyUpdater("RESOURCEMANAGER"));
-
-  final String rmHTTPAddress = "yarn.resourcemanager.webapp.address." + 
resourceManager;
-  yarnSiteUpdatersForAvailability.put(rmHTTPAddress, new 
SingleHostTopologyUpdater("RESOURCEMANAGER"));
-
-  final String rmHTTPSAddress = 
"yarn.resourcemanager.webapp.https.address." + resourceManager;
-  yarnSiteUpdatersForAvailability.put(rmHTTPSAddress, new 
SingleHostTopologyUpdater("RESOURCEMANAGER"));
+  SingleHostTopologyUpdater updater = new 
SingleHostTopologyUpdater("RESOURCEMANAGER");
+  yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.hostname." + 
resourceManager, updater);
+  yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.admin.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.resource-tracker.address."
 + resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.scheduler.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.webapp.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.webapp.https.address."
 + resourceManager, updater);
 }
 
 return highAvailabilityUpdaters;
@@ -1371,7 +1371,7 @@ public class BlueprintConfigurationProcessor {
 /**
  * Component name
  */
-private String component;
+private final String component;
 
 /**
  * Constructor.

http://git-wip-us.apache.org/repos/asf/ambari/blob/0eee38e7/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index 8a55136..34cd8a5 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -3406,6 +3406,14 @@ public class BlueprintConfigurationProcessorTest extends 
EasyMockSupport {
 yarnSiteProperties.put("yarn.resourcemanager.ha.rm-ids", "rm1, rm2");
 yarnSiteProperties.put("yarn.resourcemanager.hostname.rm1", 
expectedHostName);
 yarnSiteProperties.put("yarn.resourcemanager.hostname.rm2", 
expectedHostNameTwo);
+

[04/50] [abbrv] ambari git commit: AMBARI-21622 Install Wizard: repository_version should not be passed when creating a cluster. (atkach)

[lpuskas]

AMBARI-21622 Install Wizard: repository_version should not be passed when 
creating a cluster. (atkach)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 3ac9f5590ab60c105de806cbb5ca875fc43ee13f
Parents: 0eee38e
Author: Andrii Tkach 
Authored: Tue Aug 1 16:45:16 2017 +0300
Committer: Andrii Tkach 
Committed: Tue Aug 1 16:45:16 2017 +0300

--
 ambari-web/app/controllers/wizard/step8_controller.js | 3 +--
 ambari-web/test/controllers/wizard/step8_test.js  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac9f559/ambari-web/app/controllers/wizard/step8_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index 42519e0..cc06b5b 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -977,11 +977,10 @@ App.WizardStep8Controller = 
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
   createCluster: function () {
 if (!this.get('isInstaller')) return;
 var stackVersion = this.get('content.installOptions.localRepo') ? 
App.currentStackVersion.replace(/(-\d+(\.\d)*)/ig, "Local$&") : 
App.currentStackVersion;
-var selectedStack = App.Stack.find().findProperty('isSelected', true);
 this.addRequestToAjaxQueue({
   name: 'wizard.step8.create_cluster',
   data: {
-data: JSON.stringify({ "Clusters": {"version": stackVersion, 
"repository_version": selectedStack.get('repositoryVersion')}})
+data: JSON.stringify({ "Clusters": {"version": stackVersion}})
   },
   success: 'createClusterSuccess'
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ac9f559/ambari-web/test/controllers/wizard/step8_test.js
--
diff --git a/ambari-web/test/controllers/wizard/step8_test.js 
b/ambari-web/test/controllers/wizard/step8_test.js
index 29e6ae4..2a52598 100644
--- a/ambari-web/test/controllers/wizard/step8_test.js
+++ b/ambari-web/test/controllers/wizard/step8_test.js
@@ -1165,7 +1165,7 @@ describe('App.WizardStep8Controller', function () {
 App.set('currentStackVersion', 'HDP-2.3');
 installerStep8Controller.reopen({content: {controllerName: 
'installerController', installOptions: {localRepo: true}}});
 var data = {
-  data: JSON.stringify({ "Clusters": {"version": 'HDPLocal-2.3', 
"repository_version": "2.3.4.4-1234"}})
+  data: JSON.stringify({ "Clusters": {"version": 'HDPLocal-2.3'}})
 };
 installerStep8Controller.createCluster();
 
expect(installerStep8Controller.addRequestToAjaxQueue.args[0][0].data.data).to.equal(data.data);
@@ -1175,7 +1175,7 @@ describe('App.WizardStep8Controller', function () {
 App.set('currentStackVersion', 'HDP-2.3');
 installerStep8Controller.reopen({content: {controllerName: 
'installerController', installOptions: {localRepo: false}}});
 var data = {
-  data: JSON.stringify({ "Clusters": {"version": 'HDP-2.3', 
"repository_version": "2.3.4.4-1234"}})
+  data: JSON.stringify({ "Clusters": {"version": 'HDP-2.3'}})
 };
 installerStep8Controller.createCluster();
 
expect(installerStep8Controller.addRequestToAjaxQueue.args[0][0].data.data).to.eql(data.data);

[42/50] [abbrv] ambari git commit: AMBARI-21672 - Update Orchestration to support MAINT (part2) (jonathanhurley)

[lpuskas]

AMBARI-21672 - Update Orchestration to support MAINT (part2) (jonathanhurley)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 4dee0f0e838265d124dd3066b27760acb57c4cb5
Parents: 3155a43
Author: Jonathan Hurley 
Authored: Tue Aug 8 10:19:39 2017 -0400
Committer: Jonathan Hurley 
Committed: Tue Aug 8 10:21:23 2017 -0400

--
 .../java/org/apache/ambari/server/state/UpgradeContextTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4dee0f0e/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
index e04be5e..629ea9b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
@@ -38,13 +38,13 @@ import 
org.apache.ambari.server.state.repository.VersionDefinitionXml;
 import org.apache.ambari.server.state.stack.UpgradePack;
 import org.apache.ambari.server.state.stack.upgrade.Direction;
 import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
-import org.apache.hadoop.metrics2.sink.relocated.google.common.collect.Lists;
 import org.easymock.EasyMock;
 import org.easymock.EasyMockSupport;
 import org.easymock.Mock;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 /**

[27/50] [abbrv] ambari git commit: AMBARI-21656 - Patch/Service Downgrades Are Not Correctly Scoped (jonathanhurley)

[lpuskas]

AMBARI-21656 - Patch/Service Downgrades Are Not Correctly Scoped 
(jonathanhurley)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: e89e9505b1d509eda027cfe8bd7784976c6c0434
Parents: 4cd9657
Author: Jonathan Hurley 
Authored: Thu Aug 3 16:15:29 2017 -0400
Committer: Jonathan Hurley 
Committed: Fri Aug 4 10:01:04 2017 -0400

--
 .../VersionDefinitionResourceProvider.java  |   4 +-
 .../ambari/server/state/RepositoryType.java |  22 ++-
 .../ambari/server/state/UpgradeContext.java |  17 +-
 .../ambari/server/state/UpgradeContextTest.java | 173 +++
 4 files changed, 208 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e89e9505/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index e41e3da..5d65f35 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -426,7 +426,9 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
*/
   private void checkForParent(XmlHolder holder) throws AmbariException {
 RepositoryVersionEntity entity = holder.entity;
-if (entity.getType() != RepositoryType.PATCH) {
+
+// only STANDARD types don't have a parent
+if (entity.getType() == RepositoryType.STANDARD) {
   return;
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e89e9505/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
index da99908..3f7d447 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
@@ -43,6 +43,26 @@ public enum RepositoryType {
   /**
* Repository is used to update services.
*/
-  SERVICE
+  SERVICE;
 
+
+  /**
+   * Gets whether applications of this repository are revertable after they 
have
+   * been finalized.
+   *
+   * @return {@code true} if the repository can be revert, {@code false}
+   * otherwise.
+   */
+  public boolean isRevertable() {
+switch (this) {
+  case MAINT:
+  case PATCH:
+return true;
+  case SERVICE:
+  case STANDARD:
+return false;
+  default:
+return false;
+}
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e89e9505/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
index 59a1b02..0e409a4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
@@ -296,8 +296,9 @@ public class UpgradeContext {
   throw new AmbariException(String.format("Could not find Upgrade with 
id %s to revert.", revertUpgradeId));
   }  
   
-  if (revertUpgrade.getOrchestration() != RepositoryType.PATCH) {
-throw new AmbariException("Can only revert upgrades that have been 
done as a patch.");
+  if (!revertUpgrade.getOrchestration().isRevertable()) {
+throw new AmbariException(String.format("The %s repository type is not 
revertable",
+revertUpgrade.getOrchestration()));
   }
 
   if (revertUpgrade.getDirection() != Direction.UPGRADE) {
@@ -330,7 +331,7 @@ public class UpgradeContext {
 
   // !!! direction can ONLY be an downgrade on revert
   m_direction = Direction.DOWNGRADE;
-  m_orchestration = RepositoryType.PATCH;
+  m_orchestration = revertUpgrade.getOrchestration();
 } else {
 
   // determine direction
@@ -404,6 +405,7 

[28/50] [abbrv] ambari git commit: AMBARI-21659. Remove obsolete security_state data (amagyar)

[lpuskas]

AMBARI-21659. Remove obsolete security_state data (amagyar)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 2258b10639d510f879953b41dc4709b9e12ed05a
Parents: e89e950
Author: Attila Magyar 
Authored: Fri Aug 4 16:09:32 2017 +0200
Committer: Attila Magyar 
Committed: Fri Aug 4 16:09:32 2017 +0200

--
 .../checks/DatabaseConsistencyCheckHelper.java  |   2 -
 .../server/controller/KerberosHelperImpl.java   | 160 +--
 .../HostComponentDesiredStateEntity.java|  14 --
 .../orm/entities/HostComponentStateEntity.java  |  13 --
 .../orm/entities/ServiceDesiredStateEntity.java |  13 --
 .../kerberos/FinalizeKerberosServerAction.java  |  39 -
 .../PrepareDisableKerberosServerAction.java |   8 +-
 .../ambari/server/state/SecurityState.java  |  83 --
 .../org/apache/ambari/server/state/Service.java |  18 ---
 .../server/state/ServiceComponentHost.java  |  39 -
 .../apache/ambari/server/state/ServiceImpl.java |  21 ---
 .../svccomphost/ServiceComponentHostImpl.java   |  60 ---
 .../server/upgrade/UpgradeCatalog300.java   |  11 ++
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |   3 -
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   3 -
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   3 -
 .../resources/Ambari-DDL-Postgres-CREATE.sql|   3 -
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   3 -
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   3 -
 .../server/agent/HeartbeatProcessorTest.java|   5 -
 .../server/agent/TestHeartbeatHandler.java  |   9 +-
 .../server/controller/KerberosHelperTest.java   |  51 --
 .../FinalizeKerberosServerActionTest.java   |   6 -
 .../apache/ambari/server/state/ServiceTest.java |  41 -
 .../svccomphost/ServiceComponentHostTest.java   |  52 --
 .../server/upgrade/UpgradeCatalog300Test.java   |   8 +
 26 files changed, 25 insertions(+), 646 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2258b106/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index 2559339..b440c93 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
@@ -60,7 +60,6 @@ import org.apache.ambari.server.orm.entities.MetainfoEntity;
 import 
org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity;
 import org.apache.ambari.server.state.ClientConfigFileDefinition;
 import org.apache.ambari.server.state.ComponentInfo;
-import org.apache.ambari.server.state.SecurityState;
 import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.UpgradeState;
@@ -723,7 +722,6 @@ public class DatabaseConsistencyCheckHelper {
   
stateEntity.setHostEntity(hostComponentDesiredStateEntity.getHostEntity());
   stateEntity.setCurrentState(State.UNKNOWN);
   stateEntity.setUpgradeState(UpgradeState.NONE);
-  stateEntity.setSecurityState(SecurityState.UNKNOWN);
   
stateEntity.setServiceComponentDesiredStateEntity(hostComponentDesiredStateEntity.getServiceComponentDesiredStateEntity());
 
   LOG.error("Trying to add missing record in hostcomponentstate: {}", 
stateEntity);

http://git-wip-us.apache.org/repos/asf/ambari/blob/2258b106/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index 6b50ea4..7b8f58d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -96,7 +96,6 @@ import org.apache.ambari.server.state.Config;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.Host;
 import org.apache.ambari.server.state.HostState;
-import org.apache.ambari.server.state.SecurityState;
 import 

[44/50] [abbrv] ambari git commit: AMBARI-21307 Rest resource for supporting ambari configurations

[lpuskas]

AMBARI-21307 Rest resource for supporting ambari configurations


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: cf60e6c46d65bef00e9e27601d220e385c86889b
Parents: 64cae8e
Author: lpuskas <lpus...@apache.org>
Authored: Wed Jul 5 14:20:18 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Tue Aug 8 18:00:10 2017 +0200

--
 .../resources/ResourceInstanceFactoryImpl.java  |   4 +
 .../services/AmbariConfigurationService.java| 146 +++
 .../internal/AbstractProviderModule.java|   2 +-
 .../AmbariConfigurationResourceProvider.java| 247 +++
 .../internal/DefaultProviderModule.java |  26 +-
 .../ambari/server/controller/spi/Resource.java  |   5 +-
 .../server/orm/dao/AmbariConfigurationDAO.java  |  92 +++
 .../orm/entities/AmbariConfigurationEntity.java |  70 ++
 .../orm/entities/ConfigurationBaseEntity.java   | 159 
 .../authorization/RoleAuthorization.java|  95 +++
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  25 +-
 .../src/main/resources/META-INF/persistence.xml |   2 +
 12 files changed, 809 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cf60e6c4/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
index 96e288f..b4c57fc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
@@ -471,6 +471,10 @@ public class ResourceInstanceFactoryImpl implements 
ResourceInstanceFactory {
   case RemoteCluster:
 resourceDefinition = new RemoteClusterResourceDefinition();
 break;
+  case AmbariConfiguration:
+resourceDefinition = new 
SimpleResourceDefinition(Resource.Type.AmbariConfiguration, 
"ambariconfiguration", "ambariconfigurations");
+
+break;
 
   default:
 throw new IllegalArgumentException("Unsupported resource type: " + 
type);

http://git-wip-us.apache.org/repos/asf/ambari/blob/cf60e6c4/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
new file mode 100644
index 000..0fa6e44
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services;
+
+import java.util.Collections;
+
+import javax.ws.rs.DELETE;
+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;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.http.HttpStatus;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+
+/**
+ * Rest endpoint for managing ambari configurations. Supports CRUD operations.
+ * Ambari configurations are resources that relate to the ambari server 

[05/50] [abbrv] ambari git commit: AMBARI-21596 Log Search should stop using deprecated API for solr (mgergely)

[lpuskas]

AMBARI-21596 Log Search should stop using deprecated API for solr (mgergely)

Change-Id: I9c71874b310bc1d2789bc062c5c50903754a30b7


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: ed08865c4da057fc5e051da5375ad7ca5c494203
Parents: 3ac9f55
Author: Miklos Gergely 
Authored: Wed Aug 2 06:11:23 2017 +0200
Committer: Miklos Gergely 
Committed: Wed Aug 2 06:11:23 2017 +0200

--
 .../ambari-logsearch-server/pom.xml | 40 ++--
 .../configurer/SolrAuditAliasConfigurer.java|  4 +-
 .../configurer/SolrCollectionConfigurer.java|  4 +-
 .../logsearch/dao/SolrSchemaFieldDao.java   |  3 +-
 .../handler/AbstractSolrConfigHandler.java  |  2 +
 .../handler/CreateCollectionHandler.java| 28 +++---
 .../handler/ReloadCollectionHandler.java|  5 +--
 .../logsearch/solr/ResponseDataGenerator.java   |  3 +-
 8 files changed, 44 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ed08865c/ambari-logsearch/ambari-logsearch-server/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml 
b/ambari-logsearch/ambari-logsearch-server/pom.xml
index ebca2d5..4db1f61 100755
--- a/ambari-logsearch/ambari-logsearch-server/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-server/pom.xml
@@ -500,32 +500,32 @@
   jersey-common
   ${jersey.version}
 
-  
-javax.servlet
-javax.servlet-api
-3.1.0
-  
-  
-log4j
-log4j
-1.2.17
-  
+
+  javax.servlet
+  javax.servlet-api
+  3.1.0
+
+
+  log4j
+  log4j
+  1.2.17
+
 
   org.apache.solr
   solr-solrj
   ${solr.version}
 
 
-org.apache.solr
-solr-core
-${solr.version}
-
-  
-*
-*
-  
-
-  
+  org.apache.solr
+  solr-core
+  ${solr.version}
+  
+
+  *
+  *
+
+  
+
 
   org.apache.lucene
   lucene-core

http://git-wip-us.apache.org/repos/asf/ambari/blob/ed08865c/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrAuditAliasConfigurer.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrAuditAliasConfigurer.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrAuditAliasConfigurer.java
index 1eca94b..679c1f5 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrAuditAliasConfigurer.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrAuditAliasConfigurer.java
@@ -115,9 +115,7 @@ public class SolrAuditAliasConfigurer implements Configurer 
{
 String collectionsCSV = null;
 if (!collectionToAdd.isEmpty()) {
   collectionsCSV = StringUtils.join(collectionToAdd, ',');
-  CollectionAdminRequest.CreateAlias aliasCreateRequest = new 
CollectionAdminRequest.CreateAlias();
-  aliasCreateRequest.setAliasName(aliasNameIn);
-  aliasCreateRequest.setAliasedCollections(collectionsCSV);
+  CollectionAdminRequest.CreateAlias aliasCreateRequest = 
CollectionAdminRequest.createAlias(aliasNameIn, collectionsCSV);
   CollectionAdminResponse createResponse = 
aliasCreateRequest.process(solrClient);
   if (createResponse.getStatus() != 0) {
 LOG.error("Error creating alias. alias=" + aliasNameIn + ", 
collectionList=" + collectionsCSV

http://git-wip-us.apache.org/repos/asf/ambari/blob/ed08865c/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
index 225f5a3..6de34ce 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
@@ -123,7 +123,7 @@ public class SolrCollectionConfigurer implements 

[14/50] [abbrv] ambari git commit: AMBARI-21639. When Adding a New Service the Repository ID is Required (ncole)

[lpuskas]

AMBARI-21639. When Adding a New Service the Repository ID is Required (ncole)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 9e91639ba3579e3f0d9e74b8c9c42990ef59b553
Parents: ea57a6b
Author: Nate Cole 
Authored: Wed Aug 2 15:40:10 2017 -0400
Committer: Nate Cole 
Committed: Wed Aug 2 15:40:10 2017 -0400

--
 .../internal/ServiceResourceProvider.java   |  27 +++
 .../internal/ServiceResourceProviderTest.java   | 232 ++-
 2 files changed, 255 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9e91639b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
index daab1aa..89f75f3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
@@ -74,6 +74,7 @@ import org.apache.ambari.server.state.ServiceComponentHost;
 import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.state.State;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 
@@ -1066,6 +1067,32 @@ public class ServiceResourceProvider extends 
AbstractControllerResourceProvider
   }
 
   Long desiredRepositoryVersion = request.getDesiredRepositoryVersionId();
+
+  if (null == desiredRepositoryVersion) {
+Set repoIds = new HashSet<>();
+
+for (Service service : cluster.getServices().values()) {
+  RepositoryVersionEntity serviceRepo = 
service.getDesiredRepositoryVersion();
+  if (null != serviceRepo.getParentId()) {
+repoIds.add(serviceRepo.getParentId());
+  } else {
+repoIds.add(serviceRepo.getId());
+  }
+}
+
+LOG.info("{} was not specified; the following repository ids were 
found: {}",
+SERVICE_DESIRED_REPO_VERSION_ID_PROPERTY_ID, 
StringUtils.join(repoIds, ','));
+
+if (CollectionUtils.isEmpty(repoIds)) {
+  throw new IllegalArgumentException("No repositories were found for 
service installation");
+} else if (repoIds.size() > 1) {
+  throw new IllegalArgumentException(String.format("%s was not 
specified, and the cluster " +
+  "contains more than one standard-type repository", 
SERVICE_DESIRED_REPO_VERSION_ID_PROPERTY_ID));
+} else {
+  desiredRepositoryVersion = repoIds.iterator().next();
+}
+  }
+
   if (null == desiredRepositoryVersion) {
 throw new IllegalArgumentException(String.format("%s is required when 
adding a service.", SERVICE_DESIRED_REPO_VERSION_ID_PROPERTY_ID));
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/9e91639b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
index a0c58ea..2bb7b7a 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
@@ -70,6 +70,7 @@ import 
org.apache.ambari.server.serveraction.kerberos.KerberosAdminAuthenticatio
 import 
org.apache.ambari.server.serveraction.kerberos.KerberosMissingAdminCredentialsException;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.RepositoryType;
 import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.ServiceComponentHost;
@@ -85,6 +86,8 @@ import org.junit.Test;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
+import 

[36/50] [abbrv] ambari git commit: AMBARI-21670. Log Search cleanup: all configurations should be spring managed (oleewere)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/555f241c/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SslConfigurer.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SslConfigurer.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SslConfigurer.java
new file mode 100644
index 000..f4e2947
--- /dev/null
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SslConfigurer.java
@@ -0,0 +1,363 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ambari.logsearch.configurer;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.net.ssl.SSLContext;
+
+import org.apache.ambari.logsearch.conf.LogSearchSslConfig;
+import org.apache.ambari.logsearch.util.FileUtil;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
+import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
+import org.bouncycastle.operator.OperatorCreationException;
+import org.bouncycastle.operator.bc.BcContentSignerBuilder;
+import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.X509v3CertificateBuilder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.crypto.params.RSAKeyParameters;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.security.SignatureException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.util.Date;
+
+import static 
org.apache.ambari.logsearch.conf.LogSearchSslConfig.CREDENTIAL_STORE_PROVIDER_PATH;
+import static 
org.apache.ambari.logsearch.conf.LogSearchSslConfig.LOGSEARCH_CERT_DEFAULT_FOLDER;
+
+@Named
+public class SslConfigurer {
+  private static final Logger LOG = 
LoggerFactory.getLogger(SslConfigurer.class);
+  
+  private static final String KEYSTORE_LOCATION_ARG = "javax.net.ssl.keyStore";
+  private static final String KEYSTORE_PASSWORD_ARG = 
"javax.net.ssl.keyStorePassword";
+  private static final String KEYSTORE_TYPE_ARG = "javax.net.ssl.keyStoreType";
+  private static final String DEFAULT_KEYSTORE_TYPE = "JKS";
+  private static final String TRUSTSTORE_LOCATION_ARG = 
"javax.net.ssl.trustStore";
+  private static final String TRUSTSTORE_PASSWORD_ARG = 
"javax.net.ssl.trustStorePassword";
+  private static final String TRUSTSTORE_TYPE_ARG = 
"javax.net.ssl.trustStoreType";
+  private static final String DEFAULT_TRUSTSTORE_TYPE = "JKS";
+  private static final String KEYSTORE_PASSWORD_PROPERTY_NAME = 
"logsearch_keystore_password";
+  private static final String TRUSTSTORE_PASSWORD_PROPERTY_NAME = 
"logsearch_truststore_password";
+  private static final String KEYSTORE_PASSWORD_FILE = 

[43/50] [abbrv] ambari git commit: AMBARI-21629 Update Include and Exclude Files for [HDFS]/Refreshnodes is called even if manage.include.files is set to false (dsen)

[lpuskas]

AMBARI-21629 Update Include and Exclude Files for [HDFS]/Refreshnodes is called 
even if manage.include.files is set to false (dsen)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 64cae8e0e17d146ebc1d9f85b13b0ba137f2484b
Parents: 4dee0f0
Author: Dmytro Sen 
Authored: Tue Aug 8 18:36:16 2017 +0300
Committer: Dmytro Sen 
Committed: Tue Aug 8 18:36:16 2017 +0300

--
 .../controller/AmbariCustomCommandExecutionHelper.java   | 11 ---
 .../controller/AmbariManagementControllerImpl.java   |  4 ++--
 .../controller/AmbariManagementControllerTest.java   |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/64cae8e0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 5f02baa..6d97854 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -138,7 +138,7 @@ public class AmbariCustomCommandExecutionHelper {
   public final static String DECOM_SLAVE_COMPONENT = "slave_type";
   public final static String HBASE_MARK_DRAINING_ONLY = "mark_draining_only";
   public final static String UPDATE_FILES_ONLY = "update_files_only";
-  public final static String MULTI_SERVICES_DECOM_REQUEST = 
"multi_services_decom_request";
+  public final static String IS_ADD_OR_DELETE_SLAVE_REQUEST = 
"is_add_or_delete_slave_request";
 
   private final static String ALIGN_MAINTENANCE_STATE = 
"align_maintenance_state";
 
@@ -856,8 +856,8 @@ public class AmbariCustomCommandExecutionHelper {
 Set includedHosts = 
getHostList(actionExecutionContext.getParameters(),
 DECOM_INCLUDED_HOSTS);
 
-if 
(actionExecutionContext.getParameters().get(MULTI_SERVICES_DECOM_REQUEST) != 
null &&
-
actionExecutionContext.getParameters().get(MULTI_SERVICES_DECOM_REQUEST).equalsIgnoreCase("true"))
 {
+if 
(actionExecutionContext.getParameters().get(IS_ADD_OR_DELETE_SLAVE_REQUEST) != 
null &&
+
actionExecutionContext.getParameters().get(IS_ADD_OR_DELETE_SLAVE_REQUEST).equalsIgnoreCase("true"))
 {
   includedHosts = getHostList(actionExecutionContext.getParameters(), 
masterCompType + "_" + DECOM_INCLUDED_HOSTS);
 }
 
@@ -1065,6 +1065,11 @@ public class AmbariCustomCommandExecutionHelper {
   List listOfExcludedHosts) {
 StringBuilder commandDetail = new StringBuilder();
 commandDetail.append(actionExecutionContext.getActionName());
+if 
(actionExecutionContext.getParameters().containsKey(IS_ADD_OR_DELETE_SLAVE_REQUEST)
 &&
+  
actionExecutionContext.getParameters().get(IS_ADD_OR_DELETE_SLAVE_REQUEST).equalsIgnoreCase("true"))
 {
+  commandDetail.append(", Update Include/Exclude Files");
+  return commandDetail;
+}
 if (listOfExcludedHosts.size() > 0) {
   commandDetail.append(", Excluded: 
").append(StringUtils.join(listOfExcludedHosts, ','));
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/64cae8e0/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 9f0fa34..b4d9608 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -3722,7 +3722,7 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 }
 LOG.debug("Refresh include/exclude files action will be executed for " + 
serviceMasterMap);
 HashMap requestProperties = new HashMap<>();
-requestProperties.put("context", "Update Include and Exclude Files for " + 
serviceMasterMap.keySet().toString());
+requestProperties.put("context", "Update Include/Exclude Files for " + 

[17/50] [abbrv] ambari git commit: AMBARI-21621 Do not call refreshnodes command after deleting a slave (dsen)

[lpuskas]

AMBARI-21621 Do not call refreshnodes command after deleting a slave  (dsen)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 4a122a220d28da86da7cafdf89d00b5c09ae4193
Parents: a45e8f4
Author: Dmytro Sen 
Authored: Thu Aug 3 14:46:51 2017 +0300
Committer: Dmytro Sen 
Committed: Thu Aug 3 14:46:51 2017 +0300

--
 .../ambari/server/controller/AmbariManagementControllerImpl.java   | 2 +-
 .../common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py | 2 +-
 .../HDFS/2.1.0.2.0/package/scripts/params_windows.py   | 2 +-
 .../common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py | 2 +-
 .../HDFS/3.0.0.3.0/package/scripts/params_windows.py   | 2 +-
 .../stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py  | 2 +-
 .../ambari/server/controller/AmbariManagementControllerTest.java   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4a122a22/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 3016027..9f0fa34 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -3725,7 +3725,7 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 requestProperties.put("context", "Update Include and Exclude Files for " + 
serviceMasterMap.keySet().toString());
 requestProperties.put("exclusive", "true");
 HashMap params = new HashMap<>();
-params.put(AmbariCustomCommandExecutionHelper.UPDATE_FILES_ONLY, "false");
+params.put(AmbariCustomCommandExecutionHelper.UPDATE_FILES_ONLY, 
String.valueOf(isDecommission));
 
 for (String masterName : masterSlaveHostsMap.keySet()) {
   if (!isDecommission) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a122a22/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index c9df2b9..256211f 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -169,7 +169,7 @@ include_file_path = 
default("/configurations/hdfs-site/dfs.hosts", None)
 hdfs_include_file = None
 manage_include_files = 
default("/configurations/hdfs-site/manage.include.files", False)
 if include_file_path and manage_include_files:
-  hdfs_include_file = list(set(slave_hosts) - set(hdfs_exclude_file))
+  hdfs_include_file = slave_hosts
 update_files_only = default("/commandParams/update_files_only",False)
 command_phase = default("/commandParams/phase","")
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a122a22/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py
index b3ac578..d01c83a 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py
@@ -48,7 +48,7 @@ hdfs_include_file = None
 manage_include_files = 
default("/configurations/hdfs-site/manage.include.files", False)
 if include_file_path and manage_include_files:
   slave_hosts = default("/clusterHostInfo/slave_hosts", [])
-  hdfs_include_file = list(set(slave_hosts) - set(hdfs_exclude_file))
+  hdfs_include_file = slave_hosts
 update_files_only = default("/commandParams/update_files_only",False)
 # HDFS High Availability properties
 dfs_ha_enabled = False

[39/50] [abbrv] ambari git commit: AMBARI-21673. Deploy fails with alert_state constraint violation (Myroslav Papirkovskyy via alejandro)

[lpuskas]

AMBARI-21673. Deploy fails with alert_state constraint violation (Myroslav 
Papirkovskyy via alejandro)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: e88b61e6c7831a569876dcbac524fbe2b465c967
Parents: 7a90a26
Author: Alejandro Fernandez 
Authored: Mon Aug 7 17:10:05 2017 -0700
Committer: Alejandro Fernandez 
Committed: Mon Aug 7 17:10:05 2017 -0700

--
 .../stacks/HDP/3.0/configuration/cluster-env.xml| 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e88b61e6/ambari-server/src/main/resources/stacks/HDP/3.0/configuration/cluster-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/3.0/configuration/cluster-env.xml 
b/ambari-server/src/main/resources/stacks/HDP/3.0/configuration/cluster-env.xml
index c2e2971..2fa33bd 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/3.0/configuration/cluster-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/3.0/configuration/cluster-env.xml
@@ -220,6 +220,18 @@ gpgcheck=0
 
 
   
+  
+  
+stack_name
+HDP
+The name of the stack.
+
+  true
+  false
+  false
+
+
+  
   
   
 stack_tools

[49/50] [abbrv] ambari git commit: AMBARI-21307 Draft implementation of the group related attributes

[lpuskas]

AMBARI-21307 Draft implementation of the group related attributes


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 467714bd573566f528e5a445328591053157c674
Parents: db099e3
Author: lpuskas <lpus...@apache.org>
Authored: Tue Aug 8 13:54:29 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Tue Aug 8 18:00:11 2017 +0200

--
 .../server/ldap/AmbariLdapConfiguration.java|  22 +-
 .../ldap/LdapConfigurationValidatorService.java |  34 +--
 .../apache/ambari/server/ldap/LdapModule.java   |   4 +-
 .../server/ldap/service/AmbariLdapFacade.java   |  25 +-
 .../ldap/service/LdapConnectionService.java |  35 +++
 .../ambari/server/ldap/service/LdapFacade.java  |   9 +-
 .../ad/AdLdapConfigurationValidatorService.java | 177 --
 ...efaultLdapConfigurationValidatorService.java | 232 +++
 .../ad/DefaultLdapConnectionService.java|  63 +
 .../service/ad/LdapConfigurationConverter.java  |  50 
 ...AdLdapConfigurationValidatorServiceTest.java | 129 ---
 ...ltLdapConfigurationValidatorServiceTest.java | 156 +
 12 files changed, 552 insertions(+), 384 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/467714bd/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
index 519f400..a6ff80b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
@@ -53,7 +53,7 @@ public class AmbariLdapConfiguration {
 GROUP_OBJECT_CLASS("ambari.ldap.group.object.class"),
 GROUP_NAME_ATTRIBUTE("ambari.ldap.group.name.attribute"),
 GROUP_MEMBER_ATTRIBUTE("ambari.ldap.group.member.attribute"),
-GROUP_SEARCH_BASE("ambari.ldap.group.member.attribute"),
+GROUP_SEARCH_BASE("ambari.ldap.group.search.base"),
 DN_ATTRIBUTE("authentication.ldap.dnAttribute");
 
 private String propertyName;
@@ -126,4 +126,24 @@ public class AmbariLdapConfiguration {
 return (String) configurationValue(LdapConfigProperty.USER_NAME_ATTRIBUTE);
   }
 
+  public String userSearchBase() {
+return (String) configurationValue(LdapConfigProperty.USER_SEARCH_BASE);
+  }
+
+  public String groupObjectClass() {
+return (String) configurationValue(LdapConfigProperty.GROUP_OBJECT_CLASS);
+  }
+
+  public String groupNameAttribute() {
+return (String) 
configurationValue(LdapConfigProperty.GROUP_NAME_ATTRIBUTE);
+  }
+
+  public String groupMemberAttribute() {
+return (String) 
configurationValue(LdapConfigProperty.GROUP_MEMBER_ATTRIBUTE);
+  }
+
+  public String groupSearchBase() {
+return (String) configurationValue(LdapConfigProperty.GROUP_SEARCH_BASE);
+  }
+
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/467714bd/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationValidatorService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationValidatorService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationValidatorService.java
index 4667721..7efa3b7 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationValidatorService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationValidatorService.java
@@ -14,8 +14,11 @@
 
 package org.apache.ambari.server.ldap;
 
+import java.util.Set;
+
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.ldap.service.AmbariLdapException;
+import org.apache.directory.ldap.client.api.LdapConnection;
 
 /**
  * Collection of operations for validating ldap configuration.
@@ -26,27 +29,32 @@ public interface LdapConfigurationValidatorService {
   /**
* Tests the connection based on the provided configuration.
*
-   * @param configuration the ambari ldap configuration instance
+   * @param ldapConnection connection instance
+   * @param configuration  the ambari ldap configuration instance
* @throws AmbariLdapException if the connection is not possible
*/
-  void checkConnection(AmbariLdapConfiguration configuration) throws 
Am

[37/50] [abbrv] ambari git commit: AMBARI-21670. Log Search cleanup: all configurations should be spring managed (oleewere)

[lpuskas]

AMBARI-21670. Log Search cleanup: all configurations should be spring managed 
(oleewere)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 555f241cf0cf4e8830ce78f069ecca152802410f
Parents: f01c32e
Author: oleewere 
Authored: Mon Aug 7 21:12:53 2017 +0200
Committer: oleewere 
Committed: Mon Aug 7 21:28:42 2017 +0200

--
 .../ambari-logsearch-logfeeder/build.properties |   2 +-
 .../ambari-logsearch-server/build.properties|   2 +-
 .../ambari-logsearch-server/pom.xml | 427 ---
 ambari-logsearch/ambari-logsearch-server/run.sh |   6 +-
 .../org/apache/ambari/logsearch/LogSearch.java  | 181 +---
 .../logsearch/common/ExternalServerClient.java  |  24 +-
 .../logsearch/common/LogSearchConstants.java|   2 +-
 .../logsearch/common/PropertiesHelper.java  | 124 --
 .../logsearch/common/XMLPropertiesHelper.java   |  79 
 .../ambari/logsearch/conf/ApiDocConfig.java |   4 +-
 .../logsearch/conf/ApplicationConfig.java   |   2 -
 .../conf/LogSearchConfigMapHolder.java  |  61 +++
 .../logsearch/conf/LogSearchHttpConfig.java |  83 
 .../conf/LogSearchJerseyResourceConfig.java |  37 ++
 .../logsearch/conf/LogSearchServletConfig.java  |  95 +
 .../logsearch/conf/LogSearchSpnegoConfig.java   | 173 
 .../logsearch/conf/LogSearchSslConfig.java  |  86 
 .../ambari/logsearch/conf/SecurityConfig.java   |   3 +
 .../conf/StaticResourceConfiguration.java   |  49 +++
 .../configurer/LogSearchConfigConfigurer.java   |  10 +-
 .../logsearch/configurer/SslConfigurer.java | 363 
 .../apache/ambari/logsearch/util/SSLUtil.java   | 388 -
 .../apache/ambari/logsearch/util/WebUtil.java   |  65 ---
 .../LogsearchKRBAuthenticationFilter.java   | 107 +
 .../web/listener/LogSearchSessionListener.java  |   4 +-
 .../logsearch/web/security/LdapProperties.java  | 365 
 .../web/security/LdapPropertyName.java  |  58 ---
 .../ambari/logsearch/web/security/LdapUtil.java | 115 -
 ...LogsearchAbstractAuthenticationProvider.java |   2 +-
 .../LogsearchAuthenticationProvider.java|   4 -
 .../LogsearchLdapAuthenticationProvider.java| 187 
 .../LogsearchLdapBindAuthenticator.java |  46 --
 .../src/main/resources/default.properties   |   1 -
 .../src/main/resources/log4j.xml| 118 ++---
 .../src/main/resources/logsearch-admin-site.xml | 116 -
 .../src/main/resources/logsearch.properties |   6 +-
 .../src/main/resources/swagger/swagger.html |  36 +-
 .../src/main/scripts/run.sh |   3 +-
 .../LogsearchAuthenticationProviderTest.java|  68 +--
 ...LogsearchLdapAuthenticationProviderTest.java |  61 ---
 .../ambari-logsearch-web/build.properties   |   2 +-
 ambari-logsearch/ambari-logsearch-web/pom.xml   |   4 +-
 ambari-logsearch/docker/logsearch-docker.sh |   4 +-
 .../docker/test-config/logsearch/log4j.xml  |  35 +-
 .../test-config/logsearch/logsearch-env.sh  |   5 +-
 .../logsearch/logsearch-https.properties|   1 +
 .../LoggingRequestHelperFactoryImpl.java|  19 +-
 .../server/upgrade/UpgradeCatalog300.java   |  28 +-
 .../common-services/LOGSEARCH/0.5.0/alerts.json |   6 +-
 .../0.5.0/configuration/logsearch-env.xml   |  14 -
 .../configuration/logsearch-properties.xml  |  21 +
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |  13 +-
 .../0.5.0/properties/logsearch-env.sh.j2|   2 -
 .../LOGSEARCH/0.5.0/quicklinks/quicklinks.json  |  10 +-
 .../LoggingRequestHelperFactoryImplTest.java|  10 +-
 .../stacks/2.4/LOGSEARCH/test_logsearch.py  |   2 +
 .../test/python/stacks/2.4/configs/default.json |   5 +-
 .../configs/services/logsearch_properties.js|  97 +++--
 58 files changed, 1339 insertions(+), 2502 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/555f241c/ambari-logsearch/ambari-logsearch-logfeeder/build.properties
--
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/build.properties 
b/ambari-logsearch/ambari-logsearch-logfeeder/build.properties
index 46979e5..013ba2e 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/build.properties
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/build.properties
@@ -15,4 +15,4 @@ app.pkg.dir=${app.work.dir}/pkg
 app.dev.war.dir=${app.work.dir}/webapps/logsearch
 app.war.name=logsearch.war
 
-app.target.dir=${builddir}/target/classes/webapps/app
\ No newline at end 

[34/50] [abbrv] ambari git commit: AMBARI-21671. Expose via API whether a service will participate in an upgrade (ncole)

[lpuskas]

AMBARI-21671. Expose via API whether a service will participate in an upgrade 
(ncole)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: f01c32ed4c9e7ef0068aec741de5371e280ebccb
Parents: 153e03a
Author: Nate Cole 
Authored: Mon Aug 7 10:38:50 2017 -0400
Committer: Nate Cole 
Committed: Mon Aug 7 11:11:48 2017 -0400

--
 .../ClusterStackVersionResourceProvider.java|  22 +++-
 .../org/apache/ambari/server/state/Service.java |   2 +
 .../apache/ambari/server/state/ServiceImpl.java |  10 +-
 .../state/repository/ClusterVersionSummary.java |  56 
 .../state/repository/ServiceVersionSummary.java |  79 
 .../state/repository/VersionDefinitionXml.java  | 127 ++-
 .../state/repository/VersionDefinitionTest.java |  55 +++-
 .../resources/version_definition_test_maint.xml |   2 +-
 .../version_definition_test_maint_partial.xml   |  54 
 9 files changed, 371 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f01c32ed/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 9ecea95..979124e 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
@@ -75,6 +75,7 @@ import org.apache.ambari.server.state.RepositoryVersionState;
 import org.apache.ambari.server.state.ServiceComponentHost;
 import org.apache.ambari.server.state.ServiceOsSpecific;
 import org.apache.ambari.server.state.StackId;
+import org.apache.ambari.server.state.repository.ClusterVersionSummary;
 import org.apache.ambari.server.state.repository.VersionDefinitionXml;
 import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
 import org.apache.ambari.server.utils.StageUtils;
@@ -104,6 +105,8 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
   protected static final String CLUSTER_STACK_VERSION_VERSION_PROPERTY_ID = 
PropertyHelper.getPropertyId("ClusterStackVersions", "version");
   protected static final String CLUSTER_STACK_VERSION_STATE_PROPERTY_ID = 
PropertyHelper.getPropertyId("ClusterStackVersions", "state");
   protected static final String CLUSTER_STACK_VERSION_HOST_STATES_PROPERTY_ID 
= PropertyHelper.getPropertyId("ClusterStackVersions", "host_states");
+  protected static final String CLUSTER_STACK_VERSION_REPO_SUMMARY_PROPERTY_ID 
= PropertyHelper.getPropertyId("ClusterStackVersions", "repository_summary");
+
   protected static final String 
CLUSTER_STACK_VERSION_REPOSITORY_VERSION_PROPERTY_ID  = 
PropertyHelper.getPropertyId("ClusterStackVersions", "repository_version");
   protected static final String CLUSTER_STACK_VERSION_STAGE_SUCCESS_FACTOR  = 
PropertyHelper.getPropertyId("ClusterStackVersions", "success_factor");
 
@@ -143,7 +146,8 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
   CLUSTER_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID, 
CLUSTER_STACK_VERSION_STACK_PROPERTY_ID,
   CLUSTER_STACK_VERSION_VERSION_PROPERTY_ID, 
CLUSTER_STACK_VERSION_HOST_STATES_PROPERTY_ID,
   CLUSTER_STACK_VERSION_STATE_PROPERTY_ID, 
CLUSTER_STACK_VERSION_REPOSITORY_VERSION_PROPERTY_ID,
-  CLUSTER_STACK_VERSION_STAGE_SUCCESS_FACTOR, CLUSTER_STACK_VERSION_FORCE);
+  CLUSTER_STACK_VERSION_STAGE_SUCCESS_FACTOR,
+  CLUSTER_STACK_VERSION_FORCE, 
CLUSTER_STACK_VERSION_REPO_SUMMARY_PROPERTY_ID);
 
   private static Map keyPropertyIds = ImmutableMap. builder()
   .put(Type.Cluster, CLUSTER_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID)
@@ -264,8 +268,21 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
 allStates.add(hostVersionEntity.getState());
   }
 
+  ClusterVersionSummary versionSummary = null;
+  try {
+VersionDefinitionXml vdf = repositoryVersion.getRepositoryXml();
+
+versionSummary = vdf.getClusterSummary(cluster);
+  } catch (Exception e) {
+throw new IllegalArgumentException(
+String.format("Version %s is backed by a version 

[07/50] [abbrv] ambari git commit: AMBARI-21617. Function ru_set_all is not working correctly due to changed command structure (ncole)

[lpuskas]

AMBARI-21617. Function ru_set_all is not working correctly due to changed 
command structure (ncole)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 0a9f6fa943e07164be0166981d0d65814068d34e
Parents: c4a474a
Author: Nate Cole 
Authored: Mon Jul 31 14:31:37 2017 -0400
Committer: Nate Cole 
Committed: Wed Aug 2 07:57:22 2017 -0400

--
 .../internal/UpgradeResourceProvider.java   |  17 ++
 .../ambari/server/state/ConfigHelper.java   |   1 -
 .../ambari/server/state/UpgradeContext.java |   2 +-
 .../ambari/server/state/UpgradeHelper.java  |  41 ++-
 .../custom_actions/scripts/ru_set_all.py|  31 ---
 .../ExecutionCommandWrapperTest.java|  70 -
 .../server/api/services/AmbariMetaInfoTest.java |   2 +
 .../AmbariManagementControllerTest.java |   4 +-
 .../internal/UpgradeResourceProviderTest.java   |   6 +
 .../ambari/server/state/UpgradeHelperTest.java  |  81 +-
 .../server/topology/AmbariContextTest.java  |   2 -
 .../python/custom_actions/test_ru_set_all.py|  33 +--
 .../HDP/2.1.1/upgrades/upgrade_test_HDP-250.xml | 267 +++
 13 files changed, 482 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0a9f6fa9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index bc00f90..6b1fe05 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -99,6 +99,7 @@ import 
org.apache.ambari.server.state.stack.upgrade.StageWrapper;
 import org.apache.ambari.server.state.stack.upgrade.Task;
 import org.apache.ambari.server.state.stack.upgrade.TaskWrapper;
 import org.apache.ambari.server.state.stack.upgrade.UpdateStackGrouping;
+import org.apache.ambari.server.state.stack.upgrade.UpgradeScope;
 import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
 import 
org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent;
 import org.apache.ambari.server.utils.StageUtils;
@@ -951,6 +952,22 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
 Map params = getNewParameterMap(request, context);
 params.put(UpgradeContext.COMMAND_PARAM_TASKS, entity.getTasks());
 
+// !!! when not scoped to a component (generic execution task)
+if (context.isScoped(UpgradeScope.COMPLETE) && null == componentName) {
+  if (context.getDirection().isUpgrade()) {
+params.put(KeyNames.VERSION, 
context.getRepositoryVersion().getVersion());
+  } else {
+// !!! in a full downgrade, the target version should be any of the 
history versions
+UpgradeEntity lastUpgrade = s_upgradeDAO.findLastUpgradeForCluster(
+cluster.getClusterId(), Direction.UPGRADE);
+
+@Experimental(feature = ExperimentalFeature.PATCH_UPGRADES,
+comment = "Shouldn't be getting the overall downgrade-to version.")
+UpgradeHistoryEntity lastHistory = 
lastUpgrade.getHistory().iterator().next();
+params.put(KeyNames.VERSION, 
lastHistory.getFromReposistoryVersion().getVersion());
+  }
+}
+
 // Apply additional parameters to the command that come from the stage.
 applyAdditionalParameters(wrapper, params);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0a9f6fa9/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index 359b225..5393f81 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -1118,7 +1118,6 @@ public class ConfigHelper {
 serviceMapped.put(service, new HashSet());
   }
   serviceMapped.get(service).add(baseConfig);
-
 } catch (Exception e) {
   // !!! ignore
 }

[41/50] [abbrv] ambari git commit: AMBARI-21672 - Update Orchestration to support MAINT (jonathanhurley)

[lpuskas]

AMBARI-21672 - Update Orchestration to support MAINT (jonathanhurley)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 3155a43e591499e9501ee3b2f6e5f095a9883177
Parents: 2d69fc7
Author: Jonathan Hurley 
Authored: Mon Aug 7 11:03:09 2017 -0400
Committer: Jonathan Hurley 
Committed: Tue Aug 8 10:11:53 2017 -0400

--
 .../ambari/server/state/UpgradeContext.java | 140 +++
 .../ambari/server/state/UpgradeContextTest.java | 246 ---
 2 files changed, 309 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3155a43e/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
index 0e409a4..a4ed080 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
@@ -65,6 +65,7 @@ import org.apache.ambari.server.orm.entities.UpgradeEntity;
 import org.apache.ambari.server.orm.entities.UpgradeHistoryEntity;
 import org.apache.ambari.server.stack.MasterHostResolver;
 import org.apache.ambari.server.stageplanner.RoleGraphFactory;
+import org.apache.ambari.server.state.repository.ClusterVersionSummary;
 import org.apache.ambari.server.state.repository.VersionDefinitionXml;
 import org.apache.ambari.server.state.stack.PrereqCheckStatus;
 import org.apache.ambari.server.state.stack.UpgradePack;
@@ -114,17 +115,17 @@ public class UpgradeContext {
   /*
* The cluster that the upgrade is for.
*/
-  final private Cluster m_cluster;
+  private final Cluster m_cluster;
 
   /**
* The direction of the upgrade.
*/
-  final private Direction m_direction;
+  private final Direction m_direction;
 
   /**
* The type of upgrade.
*/
-  final private UpgradeType m_type;
+  private final UpgradeType m_type;
 
   /**
* The upgrade pack for this upgrade.
@@ -187,7 +188,7 @@ public class UpgradeContext {
* A set of services which are included in this upgrade. If this is empty,
* then all cluster services are included.
*/
-  private Set m_services = new HashSet<>();
+  private final Set m_services = new HashSet<>();
 
   /**
* A mapping of service to target repository. On an upgrade, this will be the
@@ -252,7 +253,7 @@ public class UpgradeContext {
   /**
* Used as a quick way to tell if the upgrade is to revert a patch.
*/
-  private boolean m_isRevert = false;
+  private final boolean m_isRevert;
 
   /**
* Defines orchestration type.  This is not the repository type when 
reverting a patch.
@@ -356,48 +357,8 @@ public class UpgradeContext {
   m_repositoryVersion = 
m_repoVersionDAO.findByPK(Long.valueOf(repositoryVersionId));
   m_orchestration = m_repositoryVersion.getType();
 
-  if (m_orchestration == RepositoryType.STANDARD) {
-m_services.addAll(cluster.getServices().keySet());
-  } else {
-try {
-  VersionDefinitionXml vdf = 
m_repositoryVersion.getRepositoryXml();
-  m_services.addAll(vdf.getAvailableServiceNames());
-
-  // if this is every true, then just stop the upgrade attempt and
-  // throw an exception
-  if (m_services.isEmpty()) {
-String message = String.format(
-"When using a VDF of type %s, the available services must 
be defined in the VDF",
-m_repositoryVersion.getType());
-
-throw new AmbariException(message);
-  }
-
-} catch (Exception e) {
-  String msg = String.format(
-  "Could not parse version definition for %s.  Upgrade will 
not proceed.",
-  m_repositoryVersion.getVersion());
-
-  throw new AmbariException(msg);
-}
-  }
-
-  Set installedServices = new HashSet<>();
-  // populate the target repository map for all services in the upgrade
-  for (String serviceName : m_services) {
-try {
-  Service service = cluster.getService(serviceName);
-  m_sourceRepositoryMap.put(serviceName, 
service.getDesiredRepositoryVersion());
-  m_targetRepositoryMap.put(serviceName, m_repositoryVersion);
-  

[01/50] [abbrv] ambari git commit: AMBARI-21593 : AMS stopped after RU [AMS distributed mode with 2 collectors] (avijayan) [Forced Update!]

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 9ad286791 -> 12c50a909 (forced update)


AMBARI-21593 : AMS stopped after RU [AMS distributed mode with 2 collectors] 
(avijayan)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: c7b350b678b82bae1c0834744249cb534fed18f1
Parents: 2bab215
Author: Aravindan Vijayan 
Authored: Mon Jul 31 14:30:27 2017 -0700
Committer: Aravindan Vijayan 
Committed: Mon Jul 31 14:30:27 2017 -0700

--
 .../MetricCollectorHAController.java| 42 +++-
 1 file changed, 32 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c7b350b6/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/availability/MetricCollectorHAController.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/availability/MetricCollectorHAController.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/availability/MetricCollectorHAController.java
index 53e6304..addb14e 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/availability/MetricCollectorHAController.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/availability/MetricCollectorHAController.java
@@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFactory;
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.MetricsSystemInitializationException;
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.TimelineMetricConfiguration;
 import org.apache.helix.HelixAdmin;
+import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
 import org.apache.helix.HelixManagerFactory;
 import org.apache.helix.InstanceType;
@@ -123,20 +124,41 @@ public class MetricCollectorHAController {
 admin = new ZKHelixAdmin(zkConnectUrl);
 // create cluster
 LOG.info("Creating zookeeper cluster node: " + clusterName);
-admin.addCluster(clusterName, false);
+boolean clusterAdded = admin.addCluster(clusterName, false);
+LOG.info("Was cluster added successfully? " + clusterAdded);
 
 // Adding host to the cluster
-List nodes = Collections.EMPTY_LIST;
-try {
-  nodes =  admin.getInstancesInCluster(clusterName);
-} catch (ZkNoNodeException ex) {
-  LOG.warn("Child znode under /" + CLUSTER_NAME + " not found.Recreating 
the cluster.");
-admin.addCluster(clusterName, true);
+boolean success = false;
+int tries = 5;
+int sleepTimeInSeconds = 5;
+
+for (int i = 0; i < tries && !success; i++) {
+  try {
+List nodes = admin.getInstancesInCluster(clusterName);
+if (CollectionUtils.isEmpty(nodes) || 
!nodes.contains(instanceConfig.getInstanceName())) {
+  LOG.info("Adding participant instance " + instanceConfig);
+  admin.addInstance(clusterName, instanceConfig);
+  success = true;
+}
+  } catch (HelixException | ZkNoNodeException ex) {
+LOG.warn("Helix Cluster not yet setup fully.");
+if (i < tries - 1) {
+  LOG.info("Waiting for " + sleepTimeInSeconds + " seconds and 
retrying.");
+  TimeUnit.SECONDS.sleep(sleepTimeInSeconds);
+} else {
+  LOG.error(ex);
+}
+  }
 }
 
-if (CollectionUtils.isEmpty(nodes) || 
!nodes.contains(instanceConfig.getInstanceName())) {
-  LOG.info("Adding participant instance " + instanceConfig);
-  admin.addInstance(clusterName, instanceConfig);
+if (!success) {
+  LOG.info("Trying to create " + clusterName + " again since waiting for 
the creation did not help.");
+  admin.addCluster(clusterName, true);
+  List nodes = admin.getInstancesInCluster(clusterName);
+  if (CollectionUtils.isEmpty(nodes) || 
!nodes.contains(instanceConfig.getInstanceName())) {
+LOG.info("Adding participant instance " + instanceConfig);
+admin.addInstance(clusterName, instanceConfig);
+  }
 }
 
 // Add a state model

[13/50] [abbrv] ambari git commit: AMBARI-21626 - Configs For Target Stack Are Not Created During Upgrade (jonathanhurley)

[lpuskas]

AMBARI-21626 - Configs For Target Stack Are Not Created During Upgrade 
(jonathanhurley)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: ea57a6bab346eb18eeb538bd86ac580ff7f07afc
Parents: 97ccf3b
Author: Jonathan Hurley 
Authored: Tue Aug 1 20:16:21 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Aug 2 11:41:55 2017 -0400

--
 .../org/apache/ambari/server/state/ConfigHelper.java  | 14 ++
 .../org/apache/ambari/server/state/UpgradeHelper.java |  2 +-
 .../server/state/stack/upgrade/ClusterGrouping.java   |  2 +-
 .../stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ea57a6ba/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index 5ac4c8f..6b82273 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -1242,10 +1242,9 @@ public class ConfigHelper {
   if (!defaultPropertiesByType.containsKey(type)) {
 defaultPropertiesByType.put(type, new HashMap());
   }
-  if (stackDefaultProperty.getPropertyStackUpgradeBehavior().isMerge()) {
-defaultPropertiesByType.get(type).put(stackDefaultProperty.getName(),
-stackDefaultProperty.getValue());
-  }
+
+  defaultPropertiesByType.get(type).put(stackDefaultProperty.getName(),
+  stackDefaultProperty.getValue());
 }
 
 // for every installed service, populate the default service properties
@@ -1259,10 +1258,9 @@ public class ConfigHelper {
   if (!defaultPropertiesByType.containsKey(type)) {
 defaultPropertiesByType.put(type, new HashMap());
   }
-  if (serviceDefaultProperty.getPropertyStackUpgradeBehavior().isMerge()) {
-defaultPropertiesByType.get(type).put(serviceDefaultProperty.getName(),
-serviceDefaultProperty.getValue());
-  }
+
+  defaultPropertiesByType.get(type).put(serviceDefaultProperty.getName(),
+  serviceDefaultProperty.getValue());
 }
 
 return defaultPropertiesByType;

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea57a6ba/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
index a5b40ff..7ed70de 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
@@ -892,7 +892,7 @@ public class UpgradeHelper {
   // downgrade is easy - just remove the new and make the old current
   if (direction == Direction.DOWNGRADE) {
 cluster.applyLatestConfigurations(targetStackId, serviceName);
-return;
+continue;
   }
 
   // upgrade is a bit harder - we have to merge new stack configurations in

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea57a6ba/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
index fa988c3..3deb7c8 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
@@ -387,4 +387,4 @@ public class ClusterGrouping extends Grouping {
   }
 }
   }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea57a6ba/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
--
diff --git 
a/ambari-server/src/test/resources/stacks/HDP/2.2.0/upgrades/upgrade_test_checks.xml
 

[50/50] [abbrv] ambari git commit: AMBARI-21307 Groups for the test user returned to the caller

[lpuskas]

AMBARI-21307 Groups for the test user returned to the caller


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 12c50a909aa3abb19c67817b004df26c62e77528
Parents: 467714b
Author: lpuskas <lpus...@apache.org>
Authored: Tue Aug 8 15:50:29 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Tue Aug 8 18:00:12 2017 +0200

--
 .../api/services/ldap/LdapRestService.java  | 16 +-
 .../server/ldap/AmbariLdapConfiguration.java|  2 +-
 .../apache/ambari/server/ldap/LdapModule.java   |  3 +
 .../server/ldap/service/AmbariLdapFacade.java   |  3 +-
 .../ambari/server/ldap/service/LdapFacade.java  |  3 +-
 ...efaultLdapConfigurationValidatorService.java | 25 ++---
 .../ad/DefaultLdapConnectionService.java|  2 +-
 ...ltLdapConfigurationValidatorServiceTest.java | 59 +++-
 8 files changed, 49 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/12c50a90/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
index 33b10fa..8578204 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
@@ -28,6 +28,8 @@
 
 package org.apache.ambari.server.api.services.ldap;
 
+import java.util.Set;
+
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -41,12 +43,16 @@ import org.apache.ambari.server.api.services.BaseService;
 import org.apache.ambari.server.api.services.Result;
 import org.apache.ambari.server.api.services.ResultImpl;
 import org.apache.ambari.server.api.services.ResultStatus;
+import org.apache.ambari.server.controller.internal.ResourceImpl;
+import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.ldap.AmbariLdapConfiguration;
 import org.apache.ambari.server.ldap.LdapConfigurationFactory;
 import org.apache.ambari.server.ldap.service.LdapFacade;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.Sets;
+
 /**
  * Endpoint designated to LDAP specific operations.
  */
@@ -68,6 +74,8 @@ public class LdapRestService extends BaseService {
   @Consumes(MediaType.APPLICATION_JSON)
   public Response validateConfiguration(LdapCheckConfigurationRequest 
ldapCheckConfigurationRequest) {
 
+Set groups = Sets.newHashSet();
+
 Result result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.OK));
 try {
 
@@ -86,7 +94,11 @@ public class LdapRestService extends BaseService {
 case "test-attributes":
 
   LOGGER.info("Testing LDAP attributes ");
-  
ldapFacade.checkLdapAttibutes(ldapCheckConfigurationRequest.getRequestInfo().getParameters(),
 ambariLdapConfiguration);
+  groups = 
ldapFacade.checkLdapAttibutes(ldapCheckConfigurationRequest.getRequestInfo().getParameters(),
 ambariLdapConfiguration);
+  // todo factor out the resource creation, design better the 
structure in the response
+  Resource resource = new 
ResourceImpl(Resource.Type.AmbariConfiguration);
+  resource.setProperty("groups", groups);
+  result.getResultTree().addChild(resource, "payload");
 
   break;
 case "detect-attributes":
@@ -101,7 +113,7 @@ public class LdapRestService extends BaseService {
   }
 
 } catch (Exception e) {
-  result = new ResultImpl(new 
ResultStatus(ResultStatus.STATUS.BAD_REQUEST, e));
+  result.setResultStatus(new ResultStatus(ResultStatus.STATUS.BAD_REQUEST, 
e));
 }
 
 return 
Response.status(result.getStatus().getStatusCode()).entity(getResultSerializer().serialize(result)).build();

http://git-wip-us.apache.org/repos/asf/ambari/blob/12c50a90/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
index a6ff80b..8ab587b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
++

[47/50] [abbrv] ambari git commit: AMBARI-21307 Draft skimplementation for the user related ldap config attribute validation

[lpuskas]

AMBARI-21307 Draft skimplementation for the user related ldap config attribute 
validation


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: db099e34f5b6e195e0c01be4513d1bd539aee2d0
Parents: d85127a
Author: lpuskas <lpus...@apache.org>
Authored: Tue Jul 18 17:48:07 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Tue Aug 8 18:00:11 2017 +0200

--
 ambari-project/pom.xml  |   1 +
 ambari-server/pom.xml   |   7 +-
 .../AmbariConfigurationRequestSwagger.java  |   1 -
 .../services/ldap/AmbariConfigurationDTO.java   |  67 +++
 .../ldap/LdapCheckConfigurationRequest.java |  47 +
 .../api/services/ldap/LdapOperationRequest.java |  18 ++
 .../api/services/ldap/LdapRequestInfo.java  |  61 +++
 .../api/services/ldap/LdapRestService.java  | 132 ++
 .../ambari/server/controller/AmbariServer.java  |   3 +-
 .../server/controller/ControllerModule.java |   1 +
 .../server/ldap/AmbariLdapConfiguration.java| 129 ++
 .../server/ldap/LdapConfigurationFactory.java   |  21 +++
 .../ldap/LdapConfigurationValidatorService.java |  52 ++
 .../apache/ambari/server/ldap/LdapModule.java   |  37 
 .../ldap/service/AmbariLdapException.java   |  33 
 .../server/ldap/service/AmbariLdapFacade.java   | 107 +++
 .../ambari/server/ldap/service/LdapFacade.java  |  52 ++
 .../server/ldap/service/LdapSearchService.java  |  18 ++
 .../ad/AdLdapConfigurationValidatorService.java | 177 +++
 .../service/ad/LdapConfigurationConverter.java  |  50 ++
 .../api/services/ldap/LDAPServiceTest.java  |  85 +
 ...AdLdapConfigurationValidatorServiceTest.java | 129 ++
 22 files changed, 1224 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/db099e34/ambari-project/pom.xml
--
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 524a8f7..af9cda3 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -31,6 +31,7 @@
 ${project.parent.basedir}
 1.6.3
 8.1.19.v20160209
+1.0.0
 6.19 
 1.5.10
 3.1.4

http://git-wip-us.apache.org/repos/asf/ambari/blob/db099e34/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 3c966f2..1047ca5 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1287,7 +1287,6 @@
 
   org.apache.directory.shared
   shared-ldap
-  test
 
 
   org.slf4j
@@ -1686,8 +1685,12 @@
   jna
   4.2.2
 
+
+  org.apache.directory.api
+  api-all
+  ${ldap-api.version}
+
   
-
   
 
   oss.sonatype.org

http://git-wip-us.apache.org/repos/asf/ambari/blob/db099e34/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
index d6714f9..5e8094e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
@@ -16,7 +16,6 @@ package org.apache.ambari.server.api.services;
 import java.util.Map;
 
 import org.apache.ambari.server.controller.ApiModel;
-import org.apache.ambari.server.orm.entities.ConfigurationBaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/db099e34/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
new file mode 100644
index 000..1b134fe
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with th

[33/50] [abbrv] ambari git commit: AMBARI-21669 Provide ability on the UI to parse include/exclude files host task name. (atkach)

[lpuskas]

AMBARI-21669 Provide ability on the UI to parse include/exclude files host task 
name. (atkach)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 153e03aa024ffa483ad2f905151f1dcb8911b520
Parents: 58827ad
Author: Andrii Tkach 
Authored: Mon Aug 7 16:24:50 2017 +0300
Committer: Andrii Tkach 
Committed: Mon Aug 7 17:24:41 2017 +0300

--
 ambari-web/app/utils/helper.js   | 11 ---
 ambari-web/test/utils/helper_test.js |  5 +
 2 files changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/153e03aa/ambari-web/app/utils/helper.js
--
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 4867c65..3bc247c 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -698,23 +698,28 @@ App.format = {
 var detailArr = command_detail.split(' ');
 var self = this;
 var result = '';
+var isIncludeExcludeFiles = false;
 //if an optional operation display name has been specified in the service 
metainfo.xml
 if (ops_display_name != null && ops_display_name.length > 0) {
   result = result + ' ' + ops_display_name;
 } else {
 detailArr.forEach( function(item) {
   // if the item has the pattern SERVICE/COMPONENT, drop the SERVICE part
-  if (item.contains('/')) {
+  if (item.contains('/') && !isIncludeExcludeFiles) {
 item = item.split('/')[1];
   }
-  if (item == 'DECOMMISSION,') {
+  if (item === 'DECOMMISSION,') {
 // ignore text 'DECOMMISSION,'( command came from 
'excluded/included'), here get the component name from request_inputs
-item = (jQuery.parseJSON(request_inputs)) ? 
jQuery.parseJSON(request_inputs).slave_type : '';
+var parsedInputs = jQuery.parseJSON(request_inputs);
+item = (parsedInputs) ? (parsedInputs.slave_type || '') : '';
+isIncludeExcludeFiles = (parsedInputs) ? 
parsedInputs.is_add_or_delete_slave_request === 'true' : false;
   }
   if (self.components[item]) {
 result = result + ' ' + self.components[item];
   } else if (self.command[item]) {
 result = result + ' ' + self.command[item];
+  } else if (isIncludeExcludeFiles) {
+result = result + ' ' + item;
   } else {
 result = result + ' ' + self.role(item, false);
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/153e03aa/ambari-web/test/utils/helper_test.js
--
diff --git a/ambari-web/test/utils/helper_test.js 
b/ambari-web/test/utils/helper_test.js
index 9dcbc4f..e64ee7e 100644
--- a/ambari-web/test/utils/helper_test.js
+++ b/ambari-web/test/utils/helper_test.js
@@ -280,6 +280,11 @@ describe('utils/helper', function() {
 it('should return install repo message', function() {
   
expect(App.format.commandDetail(installRepo)).to.be.equal(Em.I18n.t('common.installRepo.task'));
 });
+it('should return raw text when is_add_or_delete_slave_request=true', 
function() {
+  var inputs = '{"is_add_or_delete_slave_request":"true"}';
+  expect(App.format.commandDetail('DECOMMISSION, Update 
Include/Exclude Files', inputs))
+.to.be.equal('  Update Include/Exclude Files');
+});
   });
   describe('#taskStatus()', function(){
 var testable = [

[32/50] [abbrv] ambari git commit: AMBARI-21636 Fix atlas.rest.address property when Atlas is in HA for Atlas-hive hook. (atkach)

[lpuskas]

AMBARI-21636 Fix atlas.rest.address property when Atlas is in HA for Atlas-hive 
hook. (atkach)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 58827ad307f68e2db6f649987a4feae7885944d5
Parents: afa1b48
Author: Andrii Tkach 
Authored: Mon Aug 7 14:40:57 2017 +0300
Committer: Andrii Tkach 
Committed: Mon Aug 7 14:40:57 2017 +0300

--
 ambari-web/app/controllers/main/host/details.js | 69 
 1 file changed, 69 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/58827ad3/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index 382b09d..20b14ee 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -110,6 +110,11 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
   configTagsCallbackName: 'loadStormConfigs',
   configsCallbackName: 'onLoadStormConfigs'
 },
+'ATLAS_SERVER': {
+  deletePropertyName: 'deleteAtlasServer',
+  hostPropertyName: 'atlasServer',
+  configsCallbackName: 'onLoadAtlasConfigs'
+},
 'RANGER_KMS_SERVER': {
   deletePropertyName: 'deleteRangerKMSServer',
   hostPropertyName: 'rangerKMSServerHost',
@@ -1117,6 +1122,52 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
 }
   },
 
+  onLoadAtlasConfigs: function(data) {
+var atlasServer = this.get('atlasServer'),
+  atlasServerHosts = this.getAtlasServerHosts(),
+  configs = {},
+  attributes = {},
+  propertiesToChange = this.get('allPropertiesToChange');
+
+this.saveLoadedConfigs(data);
+data.items.forEach(function (item) {
+  configs[item.type] = item.properties;
+  attributes[item.type] = item.properties_attributes || {};
+}, this);
+
+var atlasAddresses = 
configs['application-properties']['atlas.rest.address'];
+var hostMask = 
atlasAddresses.split(',')[0].replace(/([https|http]*\:\/\/)(.*?)(:[0-9]+)/, 
'$1{hostname}$3');
+var atlasAddressesRecommended = atlasServerHosts.map(function(hostName) {
+  return hostMask.replace('{hostname}', hostName);
+}).join(',');
+configs['application-properties']['atlas.rest.address'] = 
atlasAddressesRecommended;
+if (this.get('isReconfigureRequired') && atlasAddresses !== 
atlasAddressesRecommended) {
+  var service = 
App.config.get('serviceByConfigTypeMap')['application-properties'];
+  propertiesToChange.pushObject({
+propertyFileName: 'application-properties',
+propertyName: 'atlas.rest.address',
+serviceDisplayName: service && service.get('displayName'),
+initialValue: atlasAddresses,
+recommendedValue: atlasAddressesRecommended
+  });
+}
+var groups = [
+  {
+properties: {
+  'application-properties': configs['application-properties']
+},
+properties_attributes: {
+  'application-properties': attributes['application-properties']
+}
+  }
+];
+if (this.get('isReconfigureRequired')) {
+  this.setConfigsChanges(groups);
+} else {
+  this.saveConfigsBatch(groups, 'ATLAS_SERVER', atlasServer);
+}
+  },
+
   /**
* Success callback for load configs request
* @param {object} data
@@ -1592,6 +1643,24 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
 return stormNimbusHosts.sort();
   },
 
+  getAtlasServerHosts: function () {
+var
+  atlasServerHosts = 
App.HostComponent.find().filterProperty('componentName', 
'ATLAS_SERVER').mapProperty('hostName'),
+  atlasServer = this.get('atlasServer');
+
+if (!!atlasServer) {
+  atlasServerHosts.push(atlasServer);
+  this.set('atlasServer', '');
+}
+
+if (this.get('fromDeleteHost') || this.get('deleteAtlasServer')) {
+  this.set('deleteAtlasServer', false);
+  this.set('fromDeleteHost', false);
+  return atlasServerHosts.without(this.get('content.hostName'));
+}
+return atlasServerHosts.sort();
+  },
+
   /**
* Send command to server to resfresh configs of selected component
* @param {object} event

[12/50] [abbrv] ambari git commit: AMBARI-21581 - Replace Hard Coded conf-select Structures (jonathanhurley)

[lpuskas]

AMBARI-21581 - Replace Hard Coded conf-select Structures (jonathanhurley)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 97ccf3bff96f8717c185776c7c000496df90daa0
Parents: 0a9f6fa
Author: Jonathan Hurley 
Authored: Tue Aug 1 10:02:37 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Aug 2 08:45:31 2017 -0400

--
 .../libraries/functions/conf_select.py  |  213 +---
 .../libraries/functions/stack_select.py |8 +-
 .../BlueprintConfigurationProcessor.java|2 +-
 .../ambari/server/state/ConfigHelper.java   |2 +-
 .../server/upgrade/FinalUpgradeCatalog.java |4 +-
 .../package/scripts/accumulo_client.py  |2 -
 .../package/scripts/accumulo_script.py  |2 -
 .../0.1.0.2.3/package/scripts/atlas_client.py   |3 +-
 .../package/scripts/metadata_server.py  |3 +-
 .../0.7.0.3.0/package/scripts/atlas_client.py   |3 +-
 .../package/scripts/metadata_server.py  |3 +-
 .../DRUID/0.9.2/package/scripts/druid_node.py   |3 -
 .../DRUID/0.9.2/package/scripts/superset.py |3 -
 .../0.5.0.2.1/package/scripts/falcon_client.py  |3 +-
 .../0.5.0.2.1/package/scripts/falcon_server.py  |2 -
 .../1.4.0.2.0/package/scripts/flume_handler.py  |3 +-
 .../0.96.0.2.0/package/scripts/hbase_client.py  |   11 +-
 .../package/scripts/phoenix_queryserver.py  |5 +-
 .../HBASE/0.96.0.2.0/package/scripts/upgrade.py |3 +-
 .../2.0.0.3.0/package/scripts/hbase_client.py   |9 +-
 .../package/scripts/phoenix_queryserver.py  |2 -
 .../HBASE/2.0.0.3.0/package/scripts/upgrade.py  |3 +-
 .../HDFS/2.1.0.2.0/package/scripts/datanode.py  |6 +-
 .../2.1.0.2.0/package/scripts/hdfs_client.py|3 +-
 .../2.1.0.2.0/package/scripts/journalnode.py|3 +-
 .../HDFS/2.1.0.2.0/package/scripts/namenode.py  |9 +-
 .../2.1.0.2.0/package/scripts/nfsgateway.py |2 -
 .../HDFS/2.1.0.2.0/package/scripts/snamenode.py |3 +-
 .../2.1.0.2.0/package/scripts/zkfc_slave.py |3 +-
 .../HDFS/3.0.0.3.0/package/scripts/datanode.py  |6 +-
 .../3.0.0.3.0/package/scripts/hdfs_client.py|3 +-
 .../3.0.0.3.0/package/scripts/journalnode.py|3 +-
 .../HDFS/3.0.0.3.0/package/scripts/namenode.py  |6 +-
 .../3.0.0.3.0/package/scripts/nfsgateway.py |2 -
 .../HDFS/3.0.0.3.0/package/scripts/snamenode.py |3 +-
 .../3.0.0.3.0/package/scripts/zkfc_slave.py |3 +-
 .../0.12.0.2.0/package/scripts/hive_client.py   |4 +-
 .../package/scripts/hive_metastore.py   |2 -
 .../0.12.0.2.0/package/scripts/hive_server.py   |2 -
 .../package/scripts/hive_server_interactive.py  |2 -
 .../package/scripts/webhcat_server.py   |5 +-
 .../2.1.0.3.0/package/scripts/hive_client.py|4 +-
 .../2.1.0.3.0/package/scripts/hive_metastore.py |2 -
 .../2.1.0.3.0/package/scripts/hive_server.py|2 -
 .../package/scripts/hive_server_interactive.py  |2 -
 .../2.1.0.3.0/package/scripts/webhcat_server.py |4 +-
 .../0.10.0.3.0/package/scripts/kafka_broker.py  |4 -
 .../KAFKA/0.8.1/package/scripts/kafka_broker.py |6 +-
 .../0.5.0.2.2/package/scripts/knox_gateway.py   |4 +-
 .../0.5.0.3.0/package/scripts/knox_gateway.py   |4 +-
 .../1.0.0.2.3/package/scripts/mahout_client.py  |2 -
 .../4.0.0.2.0/package/scripts/oozie_client.py   |3 +-
 .../4.0.0.2.0/package/scripts/oozie_server.py   |5 -
 .../4.2.0.3.0/package/scripts/oozie_client.py   |3 +-
 .../4.2.0.3.0/package/scripts/oozie_server.py   |5 -
 .../0.12.0.2.0/package/scripts/pig_client.py|4 +-
 .../0.16.1.3.0/package/scripts/pig_client.py|4 +-
 .../0.4.0/package/scripts/ranger_admin.py   |8 +-
 .../0.4.0/package/scripts/ranger_tagsync.py |8 +-
 .../0.4.0/package/scripts/ranger_usersync.py|4 +-
 .../RANGER/0.4.0/package/scripts/upgrade.py |   31 -
 .../1.0.0.3.0/package/scripts/ranger_admin.py   |4 +-
 .../1.0.0.3.0/package/scripts/ranger_tagsync.py |7 +-
 .../package/scripts/ranger_usersync.py  |2 +-
 .../RANGER/1.0.0.3.0/package/scripts/upgrade.py |4 +-
 .../0.5.0.2.3/package/scripts/kms_server.py |3 +-
 .../0.5.0.2.3/package/scripts/upgrade.py|   30 -
 .../1.0.0.3.0/package/scripts/kms_server.py |2 +-
 .../1.0.0.3.0/package/scripts/upgrade.py|3 +-
 .../0.60.0.2.2/package/scripts/slider_client.py |8 +-
 .../0.91.0.3.0/package/scripts/slider_client.py |8 +-
 .../1.2.1/package/scripts/job_history_server.py |3 +-
 .../SPARK/1.2.1/package/scripts/livy_server.py  |3 +-
 

[40/50] [abbrv] ambari git commit: AMBARI-21678 Configs page doesnt load when switched to another service while Restart is in progress.(atkach)

[lpuskas]

AMBARI-21678 Configs page doesnt load when switched to another service while 
Restart is in progress.(atkach)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 2d69fc7e043c47fb115bee03c55792f5e575e597
Parents: e88b61e
Author: Andrii Tkach 
Authored: Tue Aug 8 13:43:56 2017 +0300
Committer: Andrii Tkach 
Committed: Tue Aug 8 14:06:46 2017 +0300

--
 ambari-web/app/views/common/configs/config_history_flow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2d69fc7e/ambari-web/app/views/common/configs/config_history_flow.js
--
diff --git a/ambari-web/app/views/common/configs/config_history_flow.js 
b/ambari-web/app/views/common/configs/config_history_flow.js
index 6ff5587..6903e8e 100644
--- a/ambari-web/app/views/common/configs/config_history_flow.js
+++ b/ambari-web/app/views/common/configs/config_history_flow.js
@@ -82,7 +82,7 @@ App.ConfigHistoryFlowView = Em.View.extend({
 
   isSaveDisabled: Em.computed.or('controller.isSubmitDisabled', 
'!controller.versionLoaded', '!controller.isPropertiesChanged'),
 
-  serviceName: Em.computed.alias('controller.selectedService.serviceName'),
+  serviceName: Em.computed.alias('controller.content.serviceName'),
 
   displayedServiceVersion: Em.computed.findBy('serviceVersions', 
'isDisplayed', true),
   /**

[21/50] [abbrv] ambari git commit: AMBARI-21650: Ranger Usersync process starts with older stack script during cross stack upgrade (mugdha)

[lpuskas]

AMBARI-21650: Ranger Usersync process starts with older stack script during 
cross stack upgrade (mugdha)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: a5b8045dfbc7e8c30fc8b0d23d38ef86243c016a
Parents: b487b45
Author: Mugdha Varadkar 
Authored: Thu Aug 3 17:23:33 2017 +0530
Committer: Mugdha Varadkar 
Committed: Fri Aug 4 11:40:15 2017 +0530

--
 .../RANGER/0.4.0/package/scripts/setup_ranger_xml.py   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a5b8045d/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
index 4bcf9b0..9b1f6e2 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
@@ -551,6 +551,12 @@ def setup_usersync(upgrade_type=None):
 mode = 0755,
   )
 
+  if upgrade_type is not None and params.stack_supports_config_versioning:
+if os.path.islink('/usr/bin/ranger-usersync'):
+  Link('/usr/bin/ranger-usersync', action="delete")
+
+Link('/usr/bin/ranger-usersync', to=params.usersync_services_file)
+
   Execute(('ln','-sf', 
format('{usersync_services_file}'),'/usr/bin/ranger-usersync'),
 not_if=format("ls /usr/bin/ranger-usersync"),
 only_if=format("ls {usersync_services_file}"),

[35/50] [abbrv] ambari git commit: AMBARI-21670. Log Search cleanup: all configurations should be spring managed (oleewere)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/555f241c/ambari-logsearch/ambari-logsearch-server/src/main/resources/log4j.xml
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/resources/log4j.xml 
b/ambari-logsearch/ambari-logsearch-server/src/main/resources/log4j.xml
index dd85da8..68b697f 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/resources/log4j.xml
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/resources/log4j.xml
@@ -16,112 +16,70 @@
   limitations under the License.
 -->
 
-http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd;>
+http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd;>
 
 http://jakarta.apache.org/log4j/;>
   
-
+
 
-  
+  
 
   
 
-  
-
-
-
- 
-  
-  
-  
-  
-  
-  
-
-
   
-
-
-
-
-
-
+
class="org.apache.ambari.logsearch.appender.LogsearchRollingFileAppender">
+
+
+
+
+
+
   
 
   
-
-
-
-
-
-
+
class="org.apache.ambari.logsearch.appender.LogsearchRollingFileAppender">
+
+
+
+
+
+
   
- 
-  
+
   
-
-
+
+
   
-  
 
   
-
-
+  additivity="true">
+
   
 
   
-
-
+  additivity="false">
+
   
 
   
-
-
-
+
   
 
   
-
-
-
-
+
+
+
   
+
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/555f241c/ambari-logsearch/ambari-logsearch-server/src/main/resources/logsearch-admin-site.xml
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/resources/logsearch-admin-site.xml
 
b/ambari-logsearch/ambari-logsearch-server/src/main/resources/logsearch-admin-site.xml
deleted file mode 100644
index 049172a..000
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/resources/logsearch-admin-site.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-   
-   authentication.ldap.primaryUrl
-   
-   
-   The hostname and port for the LDAP or AD server. 
Example: my.ldap.server:389 
-   
-   
-   authentication.ldap.useSSL
-   false
-   
-   If true, use SSL when connecting to the LDAP or AD 
server.
-   
-   
-   authentication.ldap.baseDn
-   dc=example,dc=com
-   
-   The root Distinguished Name to search in the 
directory for users. Example: ou=people,dc=hadoop,dc=apache,dc=org
-   
-   
-   authentication.ldap.bindAnonymously
-   false
-   
-   If true, bind to the LDAP or AD server 
anonymously
-   
-   
-   authentication.ldap.managerDn
-   cn=Manager,dc=example,dc=com
-   
-   If Bind anonymous is set to false, the 
Distinguished Name (“DN”) for the manager.
-Example: 
uid=hdfs,ou=people,dc=hadoop,dc=apache,dc=org
-   
-   
-   authentication.ldap.managerPassword
-   
-   
-   PASSWORD
-   If Bind anonymous is set to false, the password 
for the manager
-   
-   
-   authentication.ldap.dnAttribute
-   dn
-   
-   
-   
-   
-   authentication.ldap.usernameAttribute
-   uid
-   
-   The attribute for username. Example: 
uid
-   
-   
-   authentication.ldap.userBase
-   ou=people,dc=example,dc=com
-   
-   
-   
-   
-   authentication.ldap.userObjectClass
-   person
-   
-   The object class that is used for users. Example: 
organizationalPerson
-   
-   
-   authentication.ldap.groupBase
-   ou=groups,dc=example,dc=com"
-   
-   
-   
-   
-   authentication.ldap.groupObjectClass
-   group
-   
-   The object class that is used for groups. Example: 
groupOfUniqueNames
-   
-   
-   authentication.ldap.groupNamingAttr
-   cn
-   
-   The attribute for group name.
-   
-   
-   authentication.ldap.groupMembershipAttr
-   member
-   
-   The attribute for group membership. Example: 
uniqueMember
-   
-   
-   authorization.ldap.adminGroupMappingRules
-   Logsearch Administrators
-   
-   
-   
-   
-   authorization.ldap.groupSearchFilter
-   
-   
-   
-   
-   
-  

[24/50] [abbrv] ambari git commit: AMBARI-21623 Log Search Config should be separated into a Server and Log Feeder interface (mgergely)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d1ac668/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputConfigUploader.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputConfigUploader.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputConfigUploader.java
index 5fdfded..8f8c4fd 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputConfigUploader.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputConfigUploader.java
@@ -27,8 +27,8 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.ambari.logsearch.config.api.LogSearchConfig;
 import org.apache.ambari.logfeeder.util.LogFeederPropertiesUtil;
+import org.apache.ambari.logsearch.config.api.LogSearchConfigLogFeeder;
 import org.apache.log4j.Logger;
 
 import com.google.common.io.Files;
@@ -47,13 +47,13 @@ public class InputConfigUploader extends Thread {
   };
   private final Set filesHandled = new HashSet<>();
   private final Pattern serviceNamePattern = 
Pattern.compile("input.config-(.+).json");
-  private final LogSearchConfig config;
+  private final LogSearchConfigLogFeeder config;
   
-  public static void load(LogSearchConfig config) {
+  public static void load(LogSearchConfigLogFeeder config) {
 new InputConfigUploader(config).start();
   }
   
-  private InputConfigUploader(LogSearchConfig config) {
+  private InputConfigUploader(LogSearchConfigLogFeeder config) {
 super("Input Config Loader");
 setDaemon(true);
 
@@ -73,7 +73,7 @@ public class InputConfigUploader extends Thread {
 String serviceName = m.group(1);
 String inputConfig = Files.toString(inputConfigFile, 
Charset.defaultCharset());
 
-if (!config.inputConfigExistsLogFeeder(serviceName)) {
+if (!config.inputConfigExists(serviceName)) {
   
config.createInputConfig(LogFeederPropertiesUtil.getClusterName(), serviceName, 
inputConfig);
 }
 filesHandled.add(inputConfigFile.getAbsolutePath());

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d1ac668/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/Output.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/Output.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/Output.java
index b370e58..c0075b5 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/Output.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/Output.java
@@ -28,7 +28,7 @@ import org.apache.ambari.logfeeder.common.ConfigBlock;
 import org.apache.ambari.logfeeder.input.InputMarker;
 import org.apache.ambari.logfeeder.metrics.MetricData;
 import org.apache.ambari.logfeeder.util.LogFeederUtil;
-import org.apache.ambari.logsearch.config.api.LogSearchConfig;
+import org.apache.ambari.logsearch.config.api.LogSearchConfigLogFeeder;
 import org.apache.ambari.logsearch.config.api.OutputConfigMonitor;
 import 
org.apache.ambari.logsearch.config.api.model.outputconfig.OutputProperties;
 
@@ -104,9 +104,9 @@ public abstract class Output extends ConfigBlock implements 
OutputConfigMonitor
 this.destination = destination;
   }
 
-  protected LogSearchConfig logSearchConfig;
+  protected LogSearchConfigLogFeeder logSearchConfig;
 
-  public void setLogSearchConfig(LogSearchConfig logSearchConfig) {
+  public void setLogSearchConfig(LogSearchConfigLogFeeder logSearchConfig) {
 this.logSearchConfig = logSearchConfig;
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d1ac668/ambari-logsearch/ambari-logsearch-logfeeder/src/test/java/org/apache/ambari/logfeeder/output/OutputSolrTest.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/test/java/org/apache/ambari/logfeeder/output/OutputSolrTest.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/test/java/org/apache/ambari/logfeeder/output/OutputSolrTest.java
index ce040f9..5ab271a 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/test/java/org/apache/ambari/logfeeder/output/OutputSolrTest.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/test/java/org/apache/ambari/logfeeder/output/OutputSolrTest.java
@@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.ambari.logfeeder.input.Input;
 import org.apache.ambari.logfeeder.input.InputMarker;

[48/50] [abbrv] ambari git commit: AMBARI-21307 Implemented PUT operation, added unit tests

[lpuskas]

AMBARI-21307 Implemented PUT operation, added unit tests


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: d85127a77cc3933a15eb2bf27431dfc9299c2267
Parents: a119c7b
Author: lpuskas <lpus...@apache.org>
Authored: Thu Jul 13 16:20:58 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Tue Aug 8 18:00:11 2017 +0200

--
 .../services/AmbariConfigurationService.java|  89 ---
 .../server/controller/ControllerModule.java |   2 +
 .../controller/ResourceProviderFactory.java |  23 +-
 .../AbstractControllerResourceProvider.java |   2 +
 .../AmbariConfigurationResourceProvider.java|  88 +--
 .../internal/DefaultProviderModule.java |   2 -
 .../server/orm/dao/AmbariConfigurationDAO.java  |   4 +
 ...AmbariConfigurationResourceProviderTest.java | 231 +++
 8 files changed, 363 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d85127a7/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
index 0c159b9..0632361 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -56,16 +56,10 @@ import io.swagger.annotations.ApiResponses;
  *"data": [
  *{
  * "authentication.ldap.primaryUrl": "localhost:33389"
- *},
- *{
- *"authentication.ldap.secondaryUrl": "localhost:333"
- * },
- * {
+   "authentication.ldap.secondaryUrl": "localhost:333"
  * "authentication.ldap.baseDn": "dc=ambari,dc=apache,dc=org"
- * }
- * // ..
- * ]
- * }
+  * // ..
+ * ]
  * }
  * 
  */
@@ -74,7 +68,7 @@ import io.swagger.annotations.ApiResponses;
 public class AmbariConfigurationService extends BaseService {
 
   private static final String AMBARI_CONFIGURATION_REQUEST_TYPE =
-  
"org.apache.ambari.server.api.services.AmbariConfigurationRequestSwagger";
+"org.apache.ambari.server.api.services.AmbariConfigurationRequestSwagger";
 
   /**
* Creates an ambari configuration resource.
@@ -87,9 +81,9 @@ public class AmbariConfigurationService extends BaseService {
   @POST
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Creates an ambari configuration resource",
-  nickname = "AmbariConfigurationService#createAmbariConfiguration")
+nickname = "AmbariConfigurationService#createAmbariConfiguration")
   @ApiImplicitParams({
-  @ApiImplicitParam(dataType = AMBARI_CONFIGURATION_REQUEST_TYPE, 
paramType = PARAM_TYPE_BODY)
+@ApiImplicitParam(dataType = AMBARI_CONFIGURATION_REQUEST_TYPE, paramType 
= PARAM_TYPE_BODY)
   })
   @ApiResponses({
 @ApiResponse(code = HttpStatus.SC_CREATED, message = 
MSG_SUCCESSFUL_OPERATION),
@@ -108,24 +102,24 @@ public class AmbariConfigurationService extends 
BaseService {
   @GET
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Retrieve all ambari configuration resources",
-  nickname = "AmbariConfigurationService#getAmbariConfigurations",
-  notes = "Returns all Ambari configurations.",
-  response = AmbariConfigurationResponseSwagger.class,
-  responseContainer = RESPONSE_CONTAINER_LIST)
+nickname = "AmbariConfigurationService#getAmbariConfigurations",
+notes = "Returns all Ambari configurations.",
+response = AmbariConfigurationResponseSwagger.class,
+responseContainer = RESPONSE_CONTAINER_LIST)
   @ApiImplicitParams({
-  @ApiImplicitParam(name = QUERY_FIELDS, value = QUERY_FILTER_DESCRIPTION,
-  defaultValue = "AmbariConfiguration/data, AmbariConfiguration/id, 
AmbariConfiguration/type",
-  dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY),
-  @ApiImplicitParam(name = QUERY_SORT, value = QUERY_SORT_DESCRIPTION,
-  defaultValue = "AmbariConfiguration/id",
- 

[26/50] [abbrv] ambari git commit: AMBARI-21660 Stack selection page does not load the HDP stacks. (ababiichuk)

[lpuskas]

AMBARI-21660 Stack selection page does not load the HDP stacks. (ababiichuk)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 4cd96576ed5cab53a271b4892d548002c33fb2e7
Parents: 2d1ac66
Author: ababiichuk 
Authored: Fri Aug 4 15:05:39 2017 +0300
Committer: ababiichuk 
Committed: Fri Aug 4 15:05:39 2017 +0300

--
 .../app/controllers/wizard/step1_controller.js  |   2 +
 ambari-web/app/routes/installer.js  |   4 +-
 ambari-web/app/templates/wizard/step1.hbs   | 326 ++-
 ambari-web/app/views/wizard/step1_view.js   |   2 +-
 .../test/controllers/wizard/step1_test.js   |   2 +
 ambari-web/test/views/wizard/step1_view_test.js |   2 +-
 6 files changed, 182 insertions(+), 156 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4cd96576/ambari-web/app/controllers/wizard/step1_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step1_controller.js 
b/ambari-web/app/controllers/wizard/step1_controller.js
index 22456af..c137d96 100644
--- a/ambari-web/app/controllers/wizard/step1_controller.js
+++ b/ambari-web/app/controllers/wizard/step1_controller.js
@@ -136,6 +136,8 @@ App.WizardStep1Controller = Em.Controller.extend({
*/
   selectedStackType: Em.computed.findBy('availableStackTypes', 'isSelected', 
true),
 
+  isLoadingComplete: 
Em.computed.equal('wizardController.loadStacksRequestsCounter', 0),
+
   /**
* Load selected file to current page content
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/4cd96576/ambari-web/app/routes/installer.js
--
diff --git a/ambari-web/app/routes/installer.js 
b/ambari-web/app/routes/installer.js
index eae03a7..ec8f1b9 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -149,9 +149,11 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 connectOutlets: function (router) {
   console.time('step1 connectOutlets');
   var self = this;
-  var controller = router.get('installerController');
+  var controller = router.get('installerController'),
+wizardStep1Controller = router.get('wizardStep1Controller');
   controller.setCurrentStep('1');
   controller.loadAllPriorSteps().done(function () {
+wizardStep1Controller.set('wizardController', controller);
 controller.connectOutlet('wizardStep1', controller.get('content'));
 self.scrollTop();
 console.timeEnd('step1 connectOutlets');

http://git-wip-us.apache.org/repos/asf/ambari/blob/4cd96576/ambari-web/app/templates/wizard/step1.hbs
--
diff --git a/ambari-web/app/templates/wizard/step1.hbs 
b/ambari-web/app/templates/wizard/step1.hbs
index 5faf056..6b15e65 100644
--- a/ambari-web/app/templates/wizard/step1.hbs
+++ b/ambari-web/app/templates/wizard/step1.hbs
@@ -21,121 +21,136 @@
 
   
 
-  {{! left tabs }}
-  
-
-  {{#each stack in availableStackTypes}}
-{{stack.stackName}}
-  {{/each}}
-
-  
-  
-
-  
-{{controller.selectedStack.displayName}} 
-
-  {{#each stack in selectedStackType.stacks}}
-
-  {{!view view.stackRadioButton stackBinding="stack"}}
-  {{stack.displayName}}
-{{#if stack.stackDefault}}
-  ({{t installer.step1.changeVersion.defaultVersion}})
-{{/if}}
-  
-
-  {{/each}}
-  {{t installer.step1.addVersion}} ...
-
-  
-  
-{{#unless servicesForSelectedStack}}
-  {{t 
installer.step1.useLocalRepo.infoForm.content.empty}}
-{{/unless}}
-
-  
+  {{#if isLoadingComplete}}
+{{! left tabs }}
+
+  
+{{#each stack in availableStackTypes}}
+  
+{{stack.stackName}}
+{{/each}}
+  
+
+
+  
+
+  {{controller.selectedStack.displayName}}
+
+  
+{{#each stack in selectedStackType.stacks}}
+  
+{{!view view.stackRadioButton stackBinding="stack"}}
+{{stack.displayName}}
+  {{#if 

[16/50] [abbrv] ambari git commit: AMBARI-21613. Dynamically determine what keytab files have been distributed (amagyar)

[lpuskas]

AMBARI-21613. Dynamically determine what keytab files have been distributed 
(amagyar)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: a45e8f4f5e6a214cab98896092bc7d7d588a518b
Parents: b17225d
Author: Attila Magyar 
Authored: Thu Aug 3 12:01:04 2017 +0200
Committer: Attila Magyar 
Committed: Thu Aug 3 12:01:04 2017 +0200

--
 .../resource_management/core/resources/klist.py | 45 ++
 .../ambari/server/agent/HeartBeatHandler.java   | 10 ++--
 .../ambari/server/agent/HeartbeatProcessor.java | 34 -
 .../server/controller/KerberosHelperImpl.java   | 45 +-
 .../KERBEROS/1.10.3-10/metainfo.xml |  8 
 .../package/scripts/kerberos_client.py  |  3 ++
 .../package/scripts/kerberos_common.py  | 50 +++-
 .../PERF/1.0/services/KERBEROS/metainfo.xml |  8 
 .../KERBEROS/package/scripts/kerberos_client.py |  2 +
 .../KERBEROS/package/scripts/kerberos_common.py | 48 +++
 .../server/agent/TestHeartbeatHandler.java  |  5 +-
 .../server/controller/KerberosHelperTest.java   | 24 --
 .../stacks/2.2/KERBEROS/test_kerberos_client.py | 23 +
 13 files changed, 290 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a45e8f4f/ambari-common/src/main/python/resource_management/core/resources/klist.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/resources/klist.py 
b/ambari-common/src/main/python/resource_management/core/resources/klist.py
new file mode 100644
index 000..ec6fca8
--- /dev/null
+++ b/ambari-common/src/main/python/resource_management/core/resources/klist.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Ambari Agent
+
+"""
+
+from resource_management.core import shell
+from resource_management import functions
+from resource_management.libraries.functions.default import default
+from subprocess import PIPE
+
+class Klist:
+  @staticmethod
+  def find_in_search_path():
+return 
Klist(functions.get_klist_path(default('/configurations/kerberos-env/executable_search_paths',
 None)))
+
+  def __init__(self, klist_cmd="klist"):
+self.klist_cmd = klist_cmd
+
+  def list_principals(self, keytab_path):
+code, out, err = shell.call(self._command('-k', keytab_path), stdout = 
PIPE, stderr = PIPE, timeout = 5, sudo=True)
+if code != 0 or (not out.startswith("Keytab name")):
+  raise Exception('Cannot run klist: %s. Exit code: %d. Error: %s' % 
(self.klist_cmd, code, err))
+return set(line.split()[1] for line in out.split("\n")[3:])
+
+  def _command(self, *args):
+cmd = [self.klist_cmd]
+cmd.extend(args)
+return cmd
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/a45e8f4f/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index 1bc4c36..92ab3de 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -17,6 +17,10 @@
  */
 package org.apache.ambari.server.agent;
 
+import static 
org.apache.ambari.server.controller.KerberosHelperImpl.CHECK_KEYTABS;
+import static 
org.apache.ambari.server.controller.KerberosHelperImpl.REMOVE_KEYTAB;
+import static 
org.apache.ambari.server.controller.KerberosHelperImpl.SET_KEYTAB;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import 

[22/50] [abbrv] ambari git commit: AMBARI-21648. Do not use 'dbo' schema name in idempotent Ambari DDL generator for AzureDB. (stoader)

[lpuskas]

AMBARI-21648. Do not use 'dbo' schema name in idempotent Ambari DDL generator 
for AzureDB. (stoader)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 98f15c94ee73c7d7ef938108772d3495e1d13e43
Parents: a5b8045
Author: Toader, Sebastian 
Authored: Fri Aug 4 10:04:32 2017 +0200
Committer: Toader, Sebastian 
Committed: Fri Aug 4 10:04:51 2017 +0200

--
 ambari-server/src/main/python/azuredb_create_generator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/98f15c94/ambari-server/src/main/python/azuredb_create_generator.py
--
diff --git a/ambari-server/src/main/python/azuredb_create_generator.py 
b/ambari-server/src/main/python/azuredb_create_generator.py
index 6ceaa90..1794d79 100755
--- a/ambari-server/src/main/python/azuredb_create_generator.py
+++ b/ambari-server/src/main/python/azuredb_create_generator.py
@@ -38,7 +38,7 @@ for statement in input_statements:
   statement = re.sub(
 create_table_re,
 dedent('''\
-  IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('dbo.\g<1>') AND type = 'U')
+  IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('\g<1>') AND type = 'U')
   BEGIN
   \g<0>
   END

[31/50] [abbrv] ambari git commit: AMBARI-21623 ADDENDUM Log Search Config should be separated into a Server and Log Feeder interface (mgergely)

[lpuskas]

AMBARI-21623 ADDENDUM Log Search Config should be separated into a Server and 
Log Feeder interface (mgergely)

Change-Id: I9e4c00c38ff3fc17852e589e88067fae911e1a53


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: afa1b488c1118b7f54da97cd611a317c3d385a3a
Parents: aa9e16d
Author: Miklos Gergely 
Authored: Sun Aug 6 14:23:22 2017 +0200
Committer: Miklos Gergely 
Committed: Sun Aug 6 14:23:46 2017 +0200

--
 .../ambari/logsearch/configurer/SolrCollectionConfigurer.java  | 1 +
 .../main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java| 1 -
 .../java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java   | 1 -
 .../src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java | 2 +-
 .../apache/ambari/logsearch/handler/CreateCollectionHandler.java   | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
index ff828a3..7b67482 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
@@ -219,6 +219,7 @@ public class SolrCollectionConfigurer implements Configurer 
{
   boolean reloadCollectionNeeded) {
 try {
   List allCollectionList = new 
ListCollectionHandler().handle(solrClient, null);
+  solrDaoBase.waitForLogSearchConfig();
   CreateCollectionHandler handler = new 
CreateCollectionHandler(solrDaoBase.getLogSearchConfig(), allCollectionList);
   boolean collectionCreated = handler.handle(solrClient, solrPropsConfig);
   boolean collectionReloaded = true;

http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
index 4142176..3eea08f 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
@@ -69,7 +69,6 @@ public class AuditSolrDao extends SolrDaoBase {
 String rangerAuditCollection = 
solrAuditLogPropsConfig.getRangerCollection();
 
 try {
-  waitForLogSearchConfig();
   new SolrCollectionConfigurer(this, true).start();
   boolean createAlias = (aliasNameIn != null && 
StringUtils.isNotBlank(rangerAuditCollection));
   if (createAlias) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
index 0752ac0..308ef1f 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
@@ -65,7 +65,6 @@ public class ServiceLogsSolrDao extends SolrDaoBase {
   public void postConstructor() {
 LOG.info("postConstructor() called.");
 try {
-  waitForLogSearchConfig();
   new SolrCollectionConfigurer(this, true).start();
 } catch (Exception e) {
   LOG.error("error while connecting to Solr for service logs : solrUrl=" + 
solrServiceLogPropsConfig.getSolrUrl()

[45/50] [abbrv] ambari git commit: AMBARI-21307 Added new resource related changes to the db creation ddl-s

[lpuskas]

AMBARI-21307 Added new resource related changes to the db creation ddl-s


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 11e1f7d556cacf3ad543544a1469c1387f15289b
Parents: cf60e6c
Author: lpuskas <lpus...@apache.org>
Authored: Thu Jul 6 18:15:18 2017 +0200
Committer: lpuskas <lpus...@apache.org>
Committed: Tue Aug 8 18:00:10 2017 +0200

--
 .../AmbariConfigurationResourceProvider.java| 12 ++--
 .../server/orm/dao/AmbariConfigurationDAO.java  | 65 ++--
 .../apache/ambari/server/orm/dao/DaoUtils.java  | 13 +---
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  | 21 +++
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  | 20 ++
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 20 ++
 .../resources/Ambari-DDL-Postgres-CREATE.sql| 14 ++---
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 20 ++
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   | 20 ++
 9 files changed, 120 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
index 5e5af9e..e8f186d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
@@ -97,14 +97,14 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 }
   }
 
-  private static Set properties = Sets.newHashSet(
+  private static Set PROPERTIES = Sets.newHashSet(
 ResourcePropertyId.ID.getPropertyId(),
 ResourcePropertyId.TYPE.getPropertyId(),
 ResourcePropertyId.VERSION.getPropertyId(),
 ResourcePropertyId.VERSION_TAG.getPropertyId(),
 ResourcePropertyId.DATA.getPropertyId());
 
-  private static Map<Resource.Type, String> pkPropertyMap = 
Collections.unmodifiableMap(
+  private static Map<Resource.Type, String> PK_PROPERTY_MAP = 
Collections.unmodifiableMap(
 new HashMap<Resource.Type, String>() {{
   put(Resource.Type.AmbariConfiguration, 
ResourcePropertyId.ID.getPropertyId());
 }}
@@ -117,7 +117,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
   private Gson gson;
 
   protected AmbariConfigurationResourceProvider() {
-super(properties, pkPropertyMap);
+super(PROPERTIES, PK_PROPERTY_MAP);
 
setRequiredCreateAuthorizations(EnumSet.of(RoleAuthorization.AMBARI_MANAGE_CONFIGURATION));
 
setRequiredDeleteAuthorizations(EnumSet.of(RoleAuthorization.AMBARI_MANAGE_CONFIGURATION));
 
@@ -126,7 +126,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 
   @Override
   protected Set getPKPropertyIds() {
-return Sets.newHashSet("AmbariConfiguration/id");
+return Sets.newHashSet(ResourcePropertyId.ID.getPropertyId());
   }
 
   @Override
@@ -137,7 +137,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 AmbariConfigurationEntity ambariConfigurationEntity = 
getEntityFromRequest(request);
 
 LOGGER.info("Persisting new ambari configuration: {} ", 
ambariConfigurationEntity);
-ambariConfigurationDAO.persist(ambariConfigurationEntity);
+ambariConfigurationDAO.create(ambariConfigurationEntity);
 
 return getRequestStatus(null);
   }
@@ -170,7 +170,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 } else {
   LOGGER.debug("Deleting amari configuration with id: {}", idFromRequest);
   try {
-ambariConfigurationDAO.deleteById(idFromRequest);
+ambariConfigurationDAO.removeByPK(idFromRequest);
   } catch (IllegalStateException e) {
 throw new NoSuchResourceException(e.getMessage());
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/11e1f7d5/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java
 
b/ambari-server/src/main/java/org/apache/amb

[10/50] [abbrv] ambari git commit: AMBARI-21581 - Replace Hard Coded conf-select Structures (jonathanhurley)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/package/scripts/tez_client.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/package/scripts/tez_client.py
 
b/ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/package/scripts/tez_client.py
index 8a6a6d3..b42d14e 100644
--- 
a/ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/package/scripts/tez_client.py
+++ 
b/ambari-server/src/main/resources/common-services/TEZ/0.9.0.3.0/package/scripts/tez_client.py
@@ -28,7 +28,6 @@ from ambari_commons.os_utils import copy_file, 
extract_path_component
 
 from resource_management.core.exceptions import ClientComponentHasNoStatus
 from resource_management.core.source import InlineTemplate
-from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import stack_select
 from resource_management.libraries.functions import StackFeature
 from resource_management.libraries.functions.stack_features import 
check_stack_feature
@@ -77,7 +76,6 @@ class TezClientLinux(TezClient):
   # Because this script was called from ru_execute_tasks.py which already 
enters an Environment with its own basedir,
   # must change it now so this function can find the Jinja Templates for 
the service.
   env.config.basedir = base_dir
-  conf_select.select(params.stack_name, conf_select_name, params.version)
   self.configure(env, config_dir=config_dir)
 
   def pre_upgrade_restart(self, env, upgrade_type=None):
@@ -85,8 +83,6 @@ class TezClientLinux(TezClient):
 env.set_params(params)
 
 if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, 
params.version):
-  conf_select.select(params.stack_name, "tez", params.version)
-  conf_select.select(params.stack_name, "hadoop", params.version)
   stack_select.select_packages(params.version)
 
   def install(self, env):

http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py
index a435b80..2aec6ba 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/application_timeline_server.py
@@ -20,7 +20,7 @@ Ambari Agent
 """
 
 from resource_management.libraries.script.script import Script
-from resource_management.libraries.functions import conf_select, stack_select
+from resource_management.libraries.functions import stack_select
 from resource_management.libraries.functions.constants import StackFeature
 from resource_management.libraries.functions.stack_features import 
check_stack_feature
 from resource_management.libraries.functions import check_process_status
@@ -72,7 +72,6 @@ class 
ApplicationTimelineServerDefault(ApplicationTimelineServer):
 env.set_params(params)
 
 if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, 
params.version):
-  conf_select.select(params.stack_name, "hadoop", params.version)
   stack_select.select_packages(params.version)
 
   def status(self, env):

http://git-wip-us.apache.org/repos/asf/ambari/blob/97ccf3bf/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py
index 30045f8..a93bc17 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/historyserver.py
@@ -21,7 +21,7 @@ Ambari Agent
 
 from resource_management.libraries.script.script import Script
 from resource_management.libraries.resources.hdfs_resource import HdfsResource
-from resource_management.libraries.functions import conf_select, stack_select
+from resource_management.libraries.functions import stack_select
 from resource_management.libraries.functions.constants import StackFeature
 from resource_management.libraries.functions.stack_features import 
check_stack_feature
 from resource_management.libraries.functions.check_process_status import 
check_process_status
@@ -74,7 +74,6 @@ class HistoryServerDefault(HistoryServer):
 

[18/50] [abbrv] ambari git commit: AMBARI-21640 : Certain templated Grafana dashboards not showing data. (avijayan)

[lpuskas]

AMBARI-21640 : Certain templated Grafana dashboards not showing data. (avijayan)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 07d6ec308dd2d54c0af720a181759391ffc22192
Parents: 4a122a2
Author: Aravindan Vijayan 
Authored: Thu Aug 3 09:40:40 2017 -0700
Committer: Aravindan Vijayan 
Committed: Thu Aug 3 09:40:48 2017 -0700

--
 .../ambari-metrics/datasource.js| 35 ++--
 .../HDF/grafana-nifi-hosts.json | 17 +-
 2 files changed, 41 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/07d6ec30/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
--
diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js 
b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
index b4a339e..07e76af 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -216,11 +216,12 @@ define([
   var getHostAppIdData = function(target) {
 var precision = target.precision === 'default' || typeof 
target.precision == 'undefined'  ? '' : '=' 
 + target.precision;
+var instanceId = typeof target.cluster == 'undefined'  ? '' : 
'=' + target.cluster;
 var metricAggregator = target.aggregator === "none" ? '' : '._' + 
target.aggregator;
 var metricTransform = !target.transform || target.transform === 
"none" ? '' : '._' + target.transform;
 var seriesAggregator = !target.seriesAggregator || 
target.seriesAggregator === "none" ? '' : '=' + 
target.seriesAggregator;
 return self.doAmbariRequest({ url: 
'/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform +
-metricAggregator + "=" + target.hosts + '=' + 
target.app + '=' + target.cluster + '=' + from +
+metricAggregator + "=" + target.hosts + '=' + 
target.app + instanceId + '=' + from +
 '=' + to + precision + seriesAggregator }).then(
   getMetricsData(target)
 );
@@ -240,6 +241,7 @@ define([
 
   var getServiceAppIdData = function(target) {
 var tCluster = (_.isEmpty(templateSrv.variables))? 
templatedCluster : '';
+var instanceId = typeof tCluster == 'undefined'  ? '' : 
'=' + tCluster;
 var tHost = (_.isEmpty(templateSrv.variables)) ? templatedHost : 
target.templatedHost;
 var precision = target.precision === 'default' || typeof 
target.precision == 'undefined'  ? '' : '='
 + target.precision;
@@ -247,13 +249,14 @@ define([
 var metricTransform = !target.transform || target.transform === 
"none" ? '' : '._' + target.transform;
 var seriesAggregator = !target.seriesAggregator || 
target.seriesAggregator === "none" ? '' : '=' + 
target.seriesAggregator;
 return self.doAmbariRequest({ url: 
'/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform
-  + metricAggregator + '=' + tHost + '=' + 
target.app + '=' + tCluster + '=' + from +
+  + metricAggregator + '=' + tHost + '=' + 
target.app + instanceId + '=' + from +
   '=' + to + precision + seriesAggregator }).then(
   getMetricsData(target)
 );
   };
   // To speed up querying on templatized dashboards.
   var getAllHostData = function(target) {
+var instanceId = typeof target.templatedCluster == 'undefined'  ? 
'' : '=' + target.templatedCluster;
 var precision = target.precision === 'default' || typeof 
target.precision == 'undefined'  ? '' : '='
 + target.precision;
 var metricAggregator = target.aggregator === "none" ? '' : '._' + 
target.aggregator;
@@ -269,7 +272,7 @@ define([
 var seriesAggregator = !target.seriesAggregator || 
target.seriesAggregator === "none" ? '' : '=' + 
target.seriesAggregator;
 var templatedComponent = (_.isEmpty(tComponent)) ? target.app : 
tComponent;
 return self.doAmbariRequest({ url: 
'/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform
-  + metricAggregator + '=' + target.templatedHost + 
'=' + templatedComponent + '=' + target.templatedCluster
+  + metricAggregator + '=' + target.templatedHost + 
'=' + templatedComponent + instanceId
   + '=' + 

[19/50] [abbrv] ambari git commit: AMBARI-21653. Create VDF and xsd to support MAINT upgrades (ncole)

[lpuskas]

AMBARI-21653. Create VDF and xsd to support MAINT upgrades (ncole)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 66410e5e9a977142756c0189d4582f101a8808af
Parents: 07d6ec3
Author: Nate Cole 
Authored: Thu Aug 3 12:11:30 2017 -0400
Committer: Nate Cole 
Committed: Thu Aug 3 12:54:07 2017 -0400

--
 .../ambari/server/state/RepositoryType.java | 14 +--
 .../state/repository/AvailableVersion.java  | 21 -
 .../state/repository/ManifestService.java   | 10 ++-
 .../ambari/server/state/repository/Release.java |  2 +-
 .../state/repository/VersionDefinitionXml.java  | 21 +++--
 .../src/main/resources/version_definition.xsd   |  2 +
 .../state/repository/VersionDefinitionTest.java | 95 
 .../resources/version_definition_test_maint.xml | 62 +
 contrib/version-builder/example.py  |  1 +
 contrib/version-builder/example.sh  |  3 +-
 contrib/version-builder/version_builder.py  | 13 ++-
 11 files changed, 222 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/66410e5e/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
index 1d9ec09..da99908 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
@@ -24,21 +24,25 @@ public enum RepositoryType {
 
   /**
* Repository should be considered to have all components for a cluster
-   * deployment
+   * deployment.
*/
   STANDARD,
 
   /**
* Repository may have only minimum components and is used for patching
-   * purposes
+   * purposes.
*/
   PATCH,
 
   /**
-   * Repository is used to update services
+   * Repository is used as Maintenance release, which could be several patches 
rolled up in one.
+   * Orchestration should treat Maintenance just as it does for Patch..
*/
-  SERVICE
-
+  MAINT,
 
+  /**
+   * Repository is used to update services.
+   */
+  SERVICE
 
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/66410e5e/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableVersion.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableVersion.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableVersion.java
index 3aca519..dd2cb33 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableVersion.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/AvailableVersion.java
@@ -33,6 +33,10 @@ public class AvailableVersion {
   @JsonProperty("version")
   private String version;
 
+  @JsonProperty("release_version")
+  @JsonSerialize(include=Inclusion.NON_NULL)
+  private String releaseVersion;
+
   @JsonProperty("version_id")
   @JsonSerialize(include=Inclusion.NON_NULL)
   private String versionId;
@@ -40,12 +44,27 @@ public class AvailableVersion {
   @JsonProperty
   private Set components;
 
-  AvailableVersion(String version, String versionId, Set 
components) {
+  AvailableVersion(String version, String versionId, String releaseVersion, 
Set components) {
 this.version = version;
 this.versionId = versionId;
+this.releaseVersion = releaseVersion;
 this.components = components;
   }
 
+  /**
+   * @return the binary version of the available service.
+   */
+  public String getVersion() {
+return version;
+  }
+
+  /**
+   * @return the release version of the available service.
+   */
+  public String getReleaseVersion() {
+return releaseVersion;
+  }
+
   static class Component {
 @JsonProperty("name")
 private String name;

http://git-wip-us.apache.org/repos/asf/ambari/blob/66410e5e/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ManifestService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ManifestService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/ManifestService.java
index b408a03..67f592b 100644
---