[1/2] ambari git commit: AMBARI-20394. Missing Content-Type header of woff/ttf files (Attila Magyar via adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 373ed97e1 -> cd6f14872
refs/heads/trunk b37f6f37d -> 167e111bd
AMBARI-20394. Missing Content-Type header of woff/ttf files (Attila Magyar via
adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/167e111b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/167e111b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/167e111b
Branch: refs/heads/trunk
Commit: 167e111bd443d27dad940c0db54245d5835e1daf
Parents: b37f6f3
Author: Attila Magyar
Authored: Thu Mar 16 10:26:24 2017 +0100
Committer: Attila Doroszlai
Committed: Thu Mar 16 10:26:24 2017 +0100
--
.../ambari/server/controller/AmbariServer.java| 6 ++
.../server/controller/AmbariServerTest.java | 18 ++
2 files changed, 24 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/167e111b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index a2441bd..1f1689a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -790,6 +790,7 @@ public class AmbariServer {
*/
protected void configureRootHandler(ServletContextHandler root) {
configureHandlerCompression(root);
+configureAdditionalContentTypes(root);
root.setContextPath(CONTEXT_PATH);
root.setErrorHandler(injector.getInstance(AmbariErrorHandler.class));
root.setMaxFormContentSize(-1);
@@ -819,6 +820,11 @@ public class AmbariServer {
}
}
+ private void configureAdditionalContentTypes(ServletContextHandler root) {
+root.getMimeTypes().addMimeMapping("woff", "application/font-woff");
+root.getMimeTypes().addMimeMapping("ttf", "application/font-sfnt");
+ }
+
/**
* Performs basic configuration of session manager with static values and
values from
* configuration file.
http://git-wip-us.apache.org/repos/asf/ambari/blob/167e111b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
index 85c47fc..f64a97f 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
@@ -18,10 +18,12 @@
package org.apache.ambari.server.controller;
+import static junit.framework.Assert.assertEquals;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.anyString;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.partialMockBuilder;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
@@ -55,6 +57,7 @@ import org.apache.ambari.server.state.stack.OsFamily;
import org.apache.velocity.app.Velocity;
import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
+import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.servlet.FilterHolder;
@@ -162,6 +165,7 @@ public class AmbariServerTest {
EasyMock.expectLastCall().once();
EasyMock.expect(handler.addFilter(GzipFilter.class, "/*",
EnumSet.of(DispatcherType.REQUEST))).andReturn(filter).once();
+EasyMock.expect(handler.getMimeTypes()).andReturn(new
MimeTypes()).anyTimes();
replay(handler, filter);
injector.getInstance(AmbariServer.class).configureRootHandler(handler);
@@ -186,6 +190,20 @@ public class AmbariServerTest {
EasyMock.verify(handler);
}
+ @Test
+ public void testConfigureContentTypes() throws Exception {
+ServletContextHandler handler =
EasyMock.createNiceMock(ServletContextHandler.class);
+FilterHolder filter = EasyMock.createNiceMock(FilterHolder.class);
+MimeTypes expectedMimeTypes = new MimeTypes();
+
EasyMock.expect(handler.getMimeTypes()).andReturn(expectedMimeTypes).anyTimes();
+EasyMock.expect(handler.addFilter(isA(Class.class), anyString(),
isA(EnumSet.class))).andReturn(filter).anyTimes();
+replay(handle
[2/2] ambari git commit: AMBARI-20394. Missing Content-Type header of woff/ttf files (Attila Magyar via adoroszlai)
AMBARI-20394. Missing Content-Type header of woff/ttf files (Attila Magyar via
adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cd6f1487
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cd6f1487
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cd6f1487
Branch: refs/heads/branch-2.5
Commit: cd6f14872ce6420ba66155491fb73217daa531fd
Parents: 373ed97
Author: Attila Magyar
Authored: Thu Mar 16 10:28:28 2017 +0100
Committer: Attila Doroszlai
Committed: Thu Mar 16 10:28:28 2017 +0100
--
.../ambari/server/controller/AmbariServer.java| 6 ++
.../server/controller/AmbariServerTest.java | 18 ++
2 files changed, 24 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/cd6f1487/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 17d9695..b4ae241 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -782,6 +782,7 @@ public class AmbariServer {
*/
protected void configureRootHandler(ServletContextHandler root) {
configureHandlerCompression(root);
+configureAdditionalContentTypes(root);
root.setContextPath(CONTEXT_PATH);
root.setErrorHandler(injector.getInstance(AmbariErrorHandler.class));
root.setMaxFormContentSize(-1);
@@ -811,6 +812,11 @@ public class AmbariServer {
}
}
+ private void configureAdditionalContentTypes(ServletContextHandler root) {
+root.getMimeTypes().addMimeMapping("woff", "application/font-woff");
+root.getMimeTypes().addMimeMapping("ttf", "application/font-sfnt");
+ }
+
/**
* Performs basic configuration of session manager with static values and
values from
* configuration file.
http://git-wip-us.apache.org/repos/asf/ambari/blob/cd6f1487/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
index 60e7434..ed6d5b0 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
@@ -23,10 +23,12 @@ import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.servlet.DispatcherType;
import javax.servlet.SessionCookieConfig;
+import static junit.framework.Assert.assertEquals;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.anyString;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.partialMockBuilder;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
@@ -55,6 +57,7 @@ import org.apache.ambari.server.state.stack.OsFamily;
import org.apache.velocity.app.Velocity;
import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
+import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.servlet.FilterHolder;
@@ -162,6 +165,7 @@ public class AmbariServerTest {
EasyMock.expectLastCall().once();
EasyMock.expect(handler.addFilter(GzipFilter.class, "/*",
EnumSet.of(DispatcherType.REQUEST))).andReturn(filter).once();
+EasyMock.expect(handler.getMimeTypes()).andReturn(new
MimeTypes()).anyTimes();
replay(handler, filter);
injector.getInstance(AmbariServer.class).configureRootHandler(handler);
@@ -186,6 +190,20 @@ public class AmbariServerTest {
EasyMock.verify(handler);
}
+ @Test
+ public void testConfigureContentTypes() throws Exception {
+ServletContextHandler handler =
EasyMock.createNiceMock(ServletContextHandler.class);
+FilterHolder filter = EasyMock.createNiceMock(FilterHolder.class);
+MimeTypes expectedMimeTypes = new MimeTypes();
+
EasyMock.expect(handler.getMimeTypes()).andReturn(expectedMimeTypes).anyTimes();
+EasyMock.expect(handler.addFilter(isA(Class.class), anyString(),
isA(EnumSet.class))).andReturn(filter).anyTimes();
+replay(handler, filter);
+injector.getInstanc
ambari git commit: AMBARI-20417. Spark2 Thrift Server cannot be started after upgrade due to incompletely uploaded tar.gz
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 d65fc9be0 -> 34405206a
AMBARI-20417. Spark2 Thrift Server cannot be started after upgrade due to
incompletely uploaded tar.gz
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34405206
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34405206
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34405206
Branch: refs/heads/branch-2.5
Commit: 34405206a53ce57c6cfb03aeffd8bd7fed256684
Parents: d65fc9b
Author: Attila Doroszlai
Authored: Sat Mar 11 18:29:19 2017 +0100
Committer: Attila Doroszlai
Committed: Thu Mar 16 13:04:49 2017 +0100
--
.../SPARK2/2.0.0/package/scripts/spark_service.py| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/34405206/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
--
diff --git
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
index 3efd1b7..c4bcfd2 100755
---
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
+++
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
@@ -41,7 +41,7 @@ def make_tarfile(output_filename, source_dir):
parent_dir=os.path.dirname(output_filename)
if not os.path.exists(parent_dir):
os.makedirs(parent_dir)
-os.chmod(parent_dir, 0711)
+ os.chmod(parent_dir, 0711)
with closing(tarfile.open(output_filename, "w:gz")) as tar:
for file in os.listdir(source_dir):
tar.add(os.path.join(source_dir,file),arcname=file)
@@ -63,7 +63,7 @@ def spark_service(name, upgrade_type=None, action=None):
source_dir=params.spark_home+"/jars"
tmp_archive_file=get_tarball_paths("spark2")[1]
make_tarfile(tmp_archive_file, source_dir)
- copy_to_hdfs("spark2", params.user_group, params.hdfs_user,
skip=params.sysprep_skip_copy_tarballs_hdfs)
+ copy_to_hdfs("spark2", params.user_group, params.hdfs_user,
skip=params.sysprep_skip_copy_tarballs_hdfs, replace_existing_files=True)
# create spark history directory
params.HdfsResource(params.spark_history_dir,
type="directory",
ambari git commit: AMBARI-20417. Spark2 Thrift Server cannot be started after upgrade due to incompletely uploaded tar.gz
Repository: ambari
Updated Branches:
refs/heads/trunk a9db60beb -> a57bfacfc
AMBARI-20417. Spark2 Thrift Server cannot be started after upgrade due to
incompletely uploaded tar.gz
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a57bfacf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a57bfacf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a57bfacf
Branch: refs/heads/trunk
Commit: a57bfacfc1acd138325563340ecee5d9d3140c49
Parents: a9db60b
Author: Attila Doroszlai
Authored: Sat Mar 11 18:29:19 2017 +0100
Committer: Attila Doroszlai
Committed: Thu Mar 16 13:05:42 2017 +0100
--
.../SPARK2/2.0.0/package/scripts/spark_service.py| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a57bfacf/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
--
diff --git
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
index c8a2b33..8c9be45 100755
---
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
+++
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
@@ -41,7 +41,7 @@ def make_tarfile(output_filename, source_dir):
parent_dir=os.path.dirname(output_filename)
if not os.path.exists(parent_dir):
os.makedirs(parent_dir)
-os.chmod(parent_dir, 0711)
+ os.chmod(parent_dir, 0711)
with closing(tarfile.open(output_filename, "w:gz")) as tar:
for file in os.listdir(source_dir):
tar.add(os.path.join(source_dir,file),arcname=file)
@@ -63,7 +63,7 @@ def spark_service(name, upgrade_type=None, action=None):
source_dir=params.spark_home+"/jars"
tmp_archive_file=get_tarball_paths("spark2")[1]
make_tarfile(tmp_archive_file, source_dir)
- copy_to_hdfs("spark2", params.user_group, params.hdfs_user,
skip=params.sysprep_skip_copy_tarballs_hdfs)
+ copy_to_hdfs("spark2", params.user_group, params.hdfs_user,
skip=params.sysprep_skip_copy_tarballs_hdfs, replace_existing_files=True)
# create spark history directory
params.HdfsResource(params.spark_history_dir,
type="directory",
ambari git commit: AMBARI-19959. Allow skipping view extraction in ambari-server setup (adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/trunk fcf396f3d -> d797c7eb2
AMBARI-19959. Allow skipping view extraction in ambari-server setup (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d797c7eb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d797c7eb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d797c7eb
Branch: refs/heads/trunk
Commit: d797c7eb250552e6655c96e68eba93961d3d70fb
Parents: fcf396f
Author: Attila Doroszlai
Authored: Fri Feb 10 13:29:18 2017 +0100
Committer: Attila Doroszlai
Committed: Tue Feb 14 08:36:41 2017 +0100
--
ambari-server/src/main/python/ambari-server.py | 2 ++
.../main/python/ambari_server/serverSetup.py| 11 ---
.../src/test/python/TestAmbariServer.py | 32
3 files changed, 28 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d797c7eb/ambari-server/src/main/python/ambari-server.py
--
diff --git a/ambari-server/src/main/python/ambari-server.py
b/ambari-server/src/main/python/ambari-server.py
index 5d4f5d7..5002cd0 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -401,6 +401,7 @@ def init_parser_options(parser):
help="Specifies the path to the JDBC driver JAR file")
parser.add_option('--skip-properties-validation', action="store_true",
default=False, help="Skip properties file validation",
dest="skip_properties_validation")
parser.add_option('--skip-database-check', action="store_true",
default=False, help="Skip database consistency check",
dest="skip_database_check")
+ parser.add_option('--skip-view-extraction', action="store_true",
default=False, help="Skip extraction of system views",
dest="skip_view_extraction")
parser.add_option('--auto-fix-database', action="store_true", default=False,
help="Automatically fix database consistency issues",
dest="fix_database_consistency")
add_parser_options('--mpack',
default=None,
@@ -503,6 +504,7 @@ def init_parser_options(parser):
parser.add_option('--version-display-name', default=None, help="Display name
of desired repo version", dest="desired_repo_version")
parser.add_option('--skip-properties-validation', action="store_true",
default=False, help="Skip properties file validation",
dest="skip_properties_validation")
parser.add_option('--skip-database-check', action="store_true",
default=False, help="Skip database consistency check",
dest="skip_database_check")
+ parser.add_option('--skip-view-extraction', action="store_true",
default=False, help="Skip extraction of system views",
dest="skip_view_extraction")
parser.add_option('--auto-fix-database', action="store_true", default=False,
help="Automatically fix database consistency issues",
dest="fix_database_consistency")
parser.add_option('--force-version', action="store_true", default=False,
help="Force version to current", dest="force_repo_version")
parser.add_option('--version', dest="stack_versions", default=None,
action="append", type="string",
http://git-wip-us.apache.org/repos/asf/ambari/blob/d797c7eb/ambari-server/src/main/python/ambari_server/serverSetup.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py
b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 8a06034..c6de088 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -1146,11 +1146,12 @@ def setup(options):
check_jdbc_drivers(options)
- print 'Extracting system views...'
- retcode = extract_views(options)
- if not retcode == 0:
-err = 'Error while extracting system views. Exiting'
-raise FatalException(retcode, err)
+ if not options.skip_view_extraction:
+print 'Extracting system views...'
+retcode = extract_views(options)
+if not retcode == 0:
+ err = 'Error while extracting system views. Exiting'
+ raise FatalException(retcode, err)
# we've already done this, but new files were created so run it one time.
adjust_directory_permissions(svc_user)
http:/
ambari git commit: AMBARI-19959. Allow skipping view extraction in ambari-server setup (adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 a8f720024 -> 706a3dfe0
AMBARI-19959. Allow skipping view extraction in ambari-server setup (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/706a3dfe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/706a3dfe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/706a3dfe
Branch: refs/heads/branch-2.5
Commit: 706a3dfe0b2250bf9d36d19ddebb48869a608c07
Parents: a8f7200
Author: Attila Doroszlai
Authored: Fri Feb 10 13:29:18 2017 +0100
Committer: Attila Doroszlai
Committed: Tue Feb 14 08:40:25 2017 +0100
--
ambari-server/src/main/python/ambari-server.py | 2 ++
.../main/python/ambari_server/serverSetup.py| 11 ---
.../src/test/python/TestAmbariServer.py | 32
3 files changed, 28 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/706a3dfe/ambari-server/src/main/python/ambari-server.py
--
diff --git a/ambari-server/src/main/python/ambari-server.py
b/ambari-server/src/main/python/ambari-server.py
index 845a9f6..e7ffe4e 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -398,6 +398,7 @@ def init_parser_options(parser):
help="Specifies the path to the JDBC driver JAR file")
parser.add_option('--skip-properties-validation', action="store_true",
default=False, help="Skip properties file validation",
dest="skip_properties_validation")
parser.add_option('--skip-database-check', action="store_true",
default=False, help="Skip database consistency check",
dest="skip_database_check")
+ parser.add_option('--skip-view-extraction', action="store_true",
default=False, help="Skip extraction of system views",
dest="skip_view_extraction")
parser.add_option('--auto-fix-database', action="store_true", default=False,
help="Automatically fix database consistency issues",
dest="fix_database_consistency")
add_parser_options('--mpack',
default=None,
@@ -500,6 +501,7 @@ def init_parser_options(parser):
parser.add_option('--version-display-name', default=None, help="Display name
of desired repo version", dest="desired_repo_version")
parser.add_option('--skip-properties-validation', action="store_true",
default=False, help="Skip properties file validation",
dest="skip_properties_validation")
parser.add_option('--skip-database-check', action="store_true",
default=False, help="Skip database consistency check",
dest="skip_database_check")
+ parser.add_option('--skip-view-extraction', action="store_true",
default=False, help="Skip extraction of system views",
dest="skip_view_extraction")
parser.add_option('--auto-fix-database', action="store_true", default=False,
help="Automatically fix database consistency issues",
dest="fix_database_consistency")
parser.add_option('--force-version', action="store_true", default=False,
help="Force version to current", dest="force_repo_version")
parser.add_option('--version', dest="stack_versions", default=None,
action="append", type="string",
http://git-wip-us.apache.org/repos/asf/ambari/blob/706a3dfe/ambari-server/src/main/python/ambari_server/serverSetup.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py
b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 42ef51f..c1643f2 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -1145,11 +1145,12 @@ def setup(options):
check_jdbc_drivers(options)
- print 'Extracting system views...'
- retcode = extract_views(options)
- if not retcode == 0:
-err = 'Error while extracting system views. Exiting'
-raise FatalException(retcode, err)
+ if not options.skip_view_extraction:
+print 'Extracting system views...'
+retcode = extract_views(options)
+if not retcode == 0:
+ err = 'Error while extracting system views. Exiting'
+ raise FatalException(retcode, err)
# we've already done this, but new files were created so run it one time.
adjust_directory_permissions(svc_u
ambari git commit: AMBARI-20070. Agent heartbeat loop stuck in subprocess.Popen (adoroszlai)
Repository: ambari Updated Branches: refs/heads/branch-2.5 0d68935c1 -> a9951bad1 AMBARI-20070. Agent heartbeat loop stuck in subprocess.Popen (adoroszlai) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9951bad Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9951bad Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9951bad Branch: refs/heads/branch-2.5 Commit: a9951bad101fef5c5449260ff7589b220edc5b13 Parents: 0d68935 Author: Attila Doroszlai Authored: Mon Feb 20 10:40:57 2017 +0100 Committer: Attila Doroszlai Committed: Mon Feb 20 10:40:57 2017 +0100 -- .../src/main/python/ambari_agent/main.py| 23 1 file changed, 23 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a9951bad/ambari-agent/src/main/python/ambari_agent/main.py -- diff --git a/ambari-agent/src/main/python/ambari_agent/main.py b/ambari-agent/src/main/python/ambari_agent/main.py index 8e577a5..3f333c4 100644 --- a/ambari-agent/src/main/python/ambari_agent/main.py +++ b/ambari-agent/src/main/python/ambari_agent/main.py @@ -42,6 +42,29 @@ def fix_subprocess_racecondition(): del sys.modules['gc'] import gc + +def fix_subprocess_popen(): + ''' + http://bugs.python.org/issue19809 + ''' + import os + import sys + + if os.name == 'posix' and sys.version_info[0] < 3: +import subprocess +import threading + +original_init = subprocess.Popen.__init__ +lock = threading.RLock() + +def locked_init(self, *a, **kw): + with lock: +original_init(self, *a, **kw) + +subprocess.Popen.__init__ = locked_init + + +fix_subprocess_popen() fix_subprocess_racecondition() fix_encoding_reimport_bug()
ambari git commit: AMBARI-20070. Agent heartbeat loop stuck in subprocess.Popen (adoroszlai)
Repository: ambari Updated Branches: refs/heads/trunk 316d33a9b -> ac4f3d11f AMBARI-20070. Agent heartbeat loop stuck in subprocess.Popen (adoroszlai) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ac4f3d11 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ac4f3d11 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ac4f3d11 Branch: refs/heads/trunk Commit: ac4f3d11f05637639638daf204cb9405ab9fe198 Parents: 316d33a Author: Attila Doroszlai Authored: Mon Feb 20 10:40:26 2017 +0100 Committer: Attila Doroszlai Committed: Mon Feb 20 10:40:26 2017 +0100 -- .../src/main/python/ambari_agent/main.py| 23 1 file changed, 23 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/ac4f3d11/ambari-agent/src/main/python/ambari_agent/main.py -- diff --git a/ambari-agent/src/main/python/ambari_agent/main.py b/ambari-agent/src/main/python/ambari_agent/main.py index 6927b15..5ca89b3 100644 --- a/ambari-agent/src/main/python/ambari_agent/main.py +++ b/ambari-agent/src/main/python/ambari_agent/main.py @@ -42,6 +42,29 @@ def fix_subprocess_racecondition(): del sys.modules['gc'] import gc + +def fix_subprocess_popen(): + ''' + http://bugs.python.org/issue19809 + ''' + import os + import sys + + if os.name == 'posix' and sys.version_info[0] < 3: +import subprocess +import threading + +original_init = subprocess.Popen.__init__ +lock = threading.RLock() + +def locked_init(self, *a, **kw): + with lock: +original_init(self, *a, **kw) + +subprocess.Popen.__init__ = locked_init + + +fix_subprocess_popen() fix_subprocess_racecondition() fix_encoding_reimport_bug()
ambari git commit: AMBARI-19076. Broken link in ambari-server/docs/api/v1/schemas.md (Masahiro Tanaka via adoroszlai)
Repository: ambari Updated Branches: refs/heads/trunk 812397d3a -> 2744ae82a AMBARI-19076. Broken link in ambari-server/docs/api/v1/schemas.md (Masahiro Tanaka via adoroszlai) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2744ae82 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2744ae82 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2744ae82 Branch: refs/heads/trunk Commit: 2744ae82af2816222807b0066a4ae60771147e1c Parents: 812397d Author: Masahiro Tanaka Authored: Mon Feb 20 11:52:51 2017 +0100 Committer: Attila Doroszlai Committed: Mon Feb 20 11:52:51 2017 +0100 -- ambari-server/docs/api/v1/schemas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/2744ae82/ambari-server/docs/api/v1/schemas.md -- diff --git a/ambari-server/docs/api/v1/schemas.md b/ambari-server/docs/api/v1/schemas.md index f52bc10..e7e4c1c 100644 --- a/ambari-server/docs/api/v1/schemas.md +++ b/ambari-server/docs/api/v1/schemas.md @@ -33,7 +33,7 @@ Ambari API Response Schemas - [GET configuration](#get-configuration) - [GET request](#get-request) - [GET task](#get-task) -- [POST/PUT/DELETE resource](#post-put-delete-resource) +- [POST/PUT/DELETE resource](#postputdelete-resource) GET clusters
[1/2] ambari git commit: AMBARI-20063. Removing secure ACLs from Kafka znodes during dekerberization (Attila Magyar via adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 c0d94efe3 -> 1ef83d76c
refs/heads/trunk 112873287 -> 83cdcea5f
AMBARI-20063. Removing secure ACLs from Kafka znodes during dekerberization
(Attila Magyar via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/83cdcea5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/83cdcea5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/83cdcea5
Branch: refs/heads/trunk
Commit: 83cdcea5fb2c5bee698b2f070489a39ed4b3df40
Parents: 1128732
Author: Attila Magyar
Authored: Thu Feb 23 11:14:03 2017 +0100
Committer: Attila Doroszlai
Committed: Thu Feb 23 11:14:03 2017 +0100
--
.../0.1.0.2.3/package/scripts/metadata_server.py | 5 ++---
.../ATLAS/0.1.0.2.3/package/scripts/params.py| 1 +
.../KAFKA/0.8.1/package/scripts/kafka_broker.py | 15 ++-
.../KAFKA/0.8.1/package/scripts/params.py| 2 ++
4 files changed, 19 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/83cdcea5/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
--
diff --git
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
index ad3270e..3c62243 100644
---
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
+++
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
@@ -154,14 +154,13 @@ class MetadataServer(Script):
def disable_security(self, env):
import params
-if not params.stack_supports_zk_security:
- Logger.info("Stack doesn't support zookeeper security")
- return
if not params.zookeeper_quorum:
Logger.info("No zookeeper connection string. Skipping reverting ACL")
return
zkmigrator = ZkMigrator(params.zookeeper_quorum, params.java_exec,
params.java64_home, params.atlas_jaas_file, params.metadata_user)
zkmigrator.set_acls(params.zk_root if params.zk_root.startswith('/') else
'/' + params.zk_root, 'world:anyone:crdwa')
+if params.atlas_kafka_group_id:
+ zkmigrator.set_acls(format('/consumers/{params.atlas_kafka_group_id}'),
'world:anyone:crdwa')
def status(self, env):
import status_params
http://git-wip-us.apache.org/repos/asf/ambari/blob/83cdcea5/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 e270733..a476e77 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
@@ -83,6 +83,7 @@ java_version = expect("/hostLevelParams/java_version", int)
zk_root =
default('/configurations/application-properties/atlas.server.ha.zookeeper.zkroot',
'/apache_atlas')
stack_supports_zk_security =
check_stack_feature(StackFeature.SECURE_ZOOKEEPER,
version_for_stack_feature_checks)
+atlas_kafka_group_id =
default('/configurations/application-properties/atlas.kafka.hook.group.id',
None)
if security_enabled:
_hostname_lowercase = config['hostname'].lower()
http://git-wip-us.apache.org/repos/asf/ambari/blob/83cdcea5/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 0901730..2f6bfaa 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
@@ -28,7 +28,6 @@ from
resource_management.libraries.functions.check_process_status import check_p
from resource_management.libraries.functions import StackFeature
from resource_management.libraries.functions.stack_features import
check_stack_feature
from resource_management.libraries.functions.show_logs import show_logs
-from resource_management.libraries.f
[2/2] ambari git commit: AMBARI-20063. Removing secure ACLs from Kafka znodes during dekerberization (Attila Magyar via adoroszlai)
AMBARI-20063. Removing secure ACLs from Kafka znodes during dekerberization
(Attila Magyar via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1ef83d76
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1ef83d76
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1ef83d76
Branch: refs/heads/branch-2.5
Commit: 1ef83d76c48a473c85f37d650689e56f03cd3b3e
Parents: c0d94ef
Author: Attila Magyar
Authored: Thu Feb 23 11:14:03 2017 +0100
Committer: Attila Doroszlai
Committed: Thu Feb 23 11:15:45 2017 +0100
--
.../0.1.0.2.3/package/scripts/metadata_server.py | 5 ++---
.../ATLAS/0.1.0.2.3/package/scripts/params.py| 1 +
.../KAFKA/0.8.1/package/scripts/kafka_broker.py | 15 ++-
.../KAFKA/0.8.1/package/scripts/params.py| 2 ++
4 files changed, 19 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1ef83d76/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
--
diff --git
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
index 2cfb25b..d79ba3d 100644
---
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
+++
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
@@ -152,14 +152,13 @@ class MetadataServer(Script):
def disable_security(self, env):
import params
-if not params.stack_supports_zk_security:
- Logger.info("Stack doesn't support zookeeper security")
- return
if not params.zookeeper_quorum:
Logger.info("No zookeeper connection string. Skipping reverting ACL")
return
zkmigrator = ZkMigrator(params.zookeeper_quorum, params.java_exec,
params.java64_home, params.atlas_jaas_file, params.metadata_user)
zkmigrator.set_acls(params.zk_root if params.zk_root.startswith('/') else
'/' + params.zk_root, 'world:anyone:crdwa')
+if params.atlas_kafka_group_id:
+ zkmigrator.set_acls(format('/consumers/{params.atlas_kafka_group_id}'),
'world:anyone:crdwa')
def status(self, env):
import status_params
http://git-wip-us.apache.org/repos/asf/ambari/blob/1ef83d76/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 5e41eac..2066b2a 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
@@ -81,6 +81,7 @@ java_version = expect("/hostLevelParams/java_version", int)
zk_root =
default('/configurations/application-properties/atlas.server.ha.zookeeper.zkroot',
'/apache_atlas')
stack_supports_zk_security =
check_stack_feature(StackFeature.SECURE_ZOOKEEPER,
version_for_stack_feature_checks)
+atlas_kafka_group_id =
default('/configurations/application-properties/atlas.kafka.hook.group.id',
None)
if security_enabled:
_hostname_lowercase = config['hostname'].lower()
http://git-wip-us.apache.org/repos/asf/ambari/blob/1ef83d76/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 024da4a..015e150 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
@@ -28,7 +28,6 @@ from
resource_management.libraries.functions.check_process_status import check_p
from resource_management.libraries.functions import StackFeature
from resource_management.libraries.functions.stack_features import
check_stack_feature
from resource_management.libraries.functions.show_logs import show_logs
-from resource_management.libraries.functions.default import default
from kafka import ensure_base_directories
import upgrade
@@ -111,6 +110,20 @@ class
[1/2] ambari git commit: AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with keytab file does not exist error (Attila Magyar via adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 6d872ad31 -> e1a354b7d
refs/heads/trunk 19da5823c -> daf876665
AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with
keytab file does not exist error (Attila Magyar via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1a354b7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1a354b7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1a354b7
Branch: refs/heads/branch-2.5
Commit: e1a354b7d912263593c0b8ff406eb230bae4d2f0
Parents: 6d872ad
Author: Attila Magyar
Authored: Fri Feb 24 10:23:27 2017 +0100
Committer: Attila Doroszlai
Committed: Fri Feb 24 10:23:56 2017 +0100
--
.../serveraction/kerberos/CreateKeytabFilesServerAction.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1a354b7/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
index 54de123..2d21752 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
@@ -217,8 +217,8 @@ public class CreateKeytabFilesServerAction extends
KerberosServerAction {
}
if (password == null) {
-if
(hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME) ||
kerberosPrincipalHostDAO
- .exists(evaluatedPrincipal, hostEntity.getHostId())) {
+if
(hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME)
+ || (kerberosPrincipalHostDAO.exists(evaluatedPrincipal,
hostEntity.getHostId()) && destinationKeytabFile.exists())) { // same principal
can have multiple keytabs, therefore checking if keytab file exists
// There is nothing to do for this since it must already
exist and we don't want to
// regenerate the keytab
message = String.format("Skipping keytab file for %s,
missing password indicates nothing to do", evaluatedPrincipal);
[2/2] ambari git commit: AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with keytab file does not exist error (Attila Magyar via adoroszlai)
AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with
keytab file does not exist error (Attila Magyar via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/daf87666
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/daf87666
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/daf87666
Branch: refs/heads/trunk
Commit: daf876665a57966d58c1ed6aa0f53b14a81265c6
Parents: 19da582
Author: Attila Magyar
Authored: Fri Feb 24 10:23:27 2017 +0100
Committer: Attila Doroszlai
Committed: Fri Feb 24 10:24:08 2017 +0100
--
.../serveraction/kerberos/CreateKeytabFilesServerAction.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/daf87666/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
index 5d6ccc0..b968383 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
@@ -218,8 +218,8 @@ public class CreateKeytabFilesServerAction extends
KerberosServerAction {
}
if (password == null) {
-if
(hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME) ||
kerberosPrincipalHostDAO
- .exists(evaluatedPrincipal, hostEntity.getHostId())) {
+if
(hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME)
+ || (kerberosPrincipalHostDAO.exists(evaluatedPrincipal,
hostEntity.getHostId()) && destinationKeytabFile.exists())) { // same principal
can have multiple keytabs, therefore checking if keytab file exists
// There is nothing to do for this since it must already
exist and we don't want to
// regenerate the keytab
message = String.format("Skipping keytab file for %s,
missing password indicates nothing to do", evaluatedPrincipal);
[1/2] ambari git commit: AMBARI-20203. Wrong placeholder in StackVersionListener error message
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 093aa3a07 -> 8ade5a6b4
refs/heads/trunk 4b7517164 -> 454e5a1ed
AMBARI-20203. Wrong placeholder in StackVersionListener error message
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/454e5a1e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/454e5a1e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/454e5a1e
Branch: refs/heads/trunk
Commit: 454e5a1edd4ea34edc730fcb4865538b00311707
Parents: 4b75171
Author: Attila Doroszlai
Authored: Mon Feb 27 09:49:33 2017 +0100
Committer: Attila Doroszlai
Committed: Mon Feb 27 13:20:27 2017 +0100
--
.../server/events/listeners/upgrade/StackVersionListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/454e5a1e/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
index 3179bd4..dd4335b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
@@ -125,7 +125,7 @@ public class StackVersionListener {
processComponentAdvertisedVersion(cluster, sch, newVersion, sc);
} else if(!sc.isVersionAdvertised() && StringUtils.isNotBlank(newVersion)
&& !UNKNOWN_VERSION.equalsIgnoreCase(newVersion)) {
-LOG.error("ServiceComponent {0} doesn't advertise version, " +
+LOG.error("ServiceComponent {} doesn't advertise version, " +
"however ServiceHostComponent {} on host {} advertised version
as {}. Skipping version update",
sc.getName(), sch.getServiceComponentName(), sch.getHostName(),
newVersion);
} else {
[2/2] ambari git commit: AMBARI-20203. Wrong placeholder in StackVersionListener error message
AMBARI-20203. Wrong placeholder in StackVersionListener error message
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8ade5a6b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8ade5a6b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8ade5a6b
Branch: refs/heads/branch-2.5
Commit: 8ade5a6b4b645b2b67d1ba66689b2f5632f0afe1
Parents: 093aa3a
Author: Attila Doroszlai
Authored: Mon Feb 27 09:49:33 2017 +0100
Committer: Attila Doroszlai
Committed: Mon Feb 27 13:20:44 2017 +0100
--
.../server/events/listeners/upgrade/StackVersionListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8ade5a6b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
index 3179bd4..dd4335b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
@@ -125,7 +125,7 @@ public class StackVersionListener {
processComponentAdvertisedVersion(cluster, sch, newVersion, sc);
} else if(!sc.isVersionAdvertised() && StringUtils.isNotBlank(newVersion)
&& !UNKNOWN_VERSION.equalsIgnoreCase(newVersion)) {
-LOG.error("ServiceComponent {0} doesn't advertise version, " +
+LOG.error("ServiceComponent {} doesn't advertise version, " +
"however ServiceHostComponent {} on host {} advertised version
as {}. Skipping version update",
sc.getName(), sch.getServiceComponentName(), sch.getHostName(),
newVersion);
} else {
[1/2] ambari git commit: Revert "AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with keytab file does not exist error (Attila Magyar via adoroszlai)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 df22ebccc -> 3a2411a9d
refs/heads/trunk 924749be0 -> b280e846f
Revert "AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails
with keytab file does not exist error (Attila Magyar via adoroszlai)"
This reverts commit daf876665a57966d58c1ed6aa0f53b14a81265c6.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b280e846
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b280e846
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b280e846
Branch: refs/heads/trunk
Commit: b280e846f2d509595c1dbb89f72c95053833220c
Parents: 924749b
Author: Attila Doroszlai
Authored: Tue Feb 28 11:24:53 2017 +0100
Committer: Attila Doroszlai
Committed: Tue Feb 28 11:24:53 2017 +0100
--
.../serveraction/kerberos/CreateKeytabFilesServerAction.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b280e846/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
index b968383..5d6ccc0 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
@@ -218,8 +218,8 @@ public class CreateKeytabFilesServerAction extends
KerberosServerAction {
}
if (password == null) {
-if
(hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME)
- || (kerberosPrincipalHostDAO.exists(evaluatedPrincipal,
hostEntity.getHostId()) && destinationKeytabFile.exists())) { // same principal
can have multiple keytabs, therefore checking if keytab file exists
+if
(hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME) ||
kerberosPrincipalHostDAO
+ .exists(evaluatedPrincipal, hostEntity.getHostId())) {
// There is nothing to do for this since it must already
exist and we don't want to
// regenerate the keytab
message = String.format("Skipping keytab file for %s,
missing password indicates nothing to do", evaluatedPrincipal);
[2/2] ambari git commit: Revert "AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with keytab file does not exist error (Attila Magyar via adoroszlai)"
Revert "AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails
with keytab file does not exist error (Attila Magyar via adoroszlai)"
This reverts commit e1a354b7d912263593c0b8ff406eb230bae4d2f0.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a2411a9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a2411a9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a2411a9
Branch: refs/heads/branch-2.5
Commit: 3a2411a9daf2769f57ecd3dedf1e2080a1571b93
Parents: df22ebc
Author: Attila Doroszlai
Authored: Tue Feb 28 11:25:14 2017 +0100
Committer: Attila Doroszlai
Committed: Tue Feb 28 11:25:14 2017 +0100
--
.../serveraction/kerberos/CreateKeytabFilesServerAction.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a2411a9/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
index 2d21752..54de123 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CreateKeytabFilesServerAction.java
@@ -217,8 +217,8 @@ public class CreateKeytabFilesServerAction extends
KerberosServerAction {
}
if (password == null) {
-if
(hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME)
- || (kerberosPrincipalHostDAO.exists(evaluatedPrincipal,
hostEntity.getHostId()) && destinationKeytabFile.exists())) { // same principal
can have multiple keytabs, therefore checking if keytab file exists
+if
(hostName.equalsIgnoreCase(KerberosHelper.AMBARI_SERVER_HOST_NAME) ||
kerberosPrincipalHostDAO
+ .exists(evaluatedPrincipal, hostEntity.getHostId())) {
// There is nothing to do for this since it must already
exist and we don't want to
// regenerate the keytab
message = String.format("Skipping keytab file for %s,
missing password indicates nothing to do", evaluatedPrincipal);
[2/2] ambari git commit: AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with keytab file does not exist error (Attila Magyar via adoroszlai)
AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with
keytab file does not exist error (Attila Magyar via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e65407ec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e65407ec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e65407ec
Branch: refs/heads/branch-2.5
Commit: e65407ecb68f3145ba3c03ff4b507081a6fa860e
Parents: d8cce33
Author: Attila Magyar
Authored: Wed Mar 1 15:35:08 2017 +0100
Committer: Attila Doroszlai
Committed: Wed Mar 1 15:35:25 2017 +0100
--
.../src/main/resources/common-services/SPARK2/2.0.0/kerberos.json | 2 +-
.../main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e65407ec/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json
--
diff --git
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json
index cf7eeba..a787d33 100755
---
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json
+++
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json
@@ -15,7 +15,7 @@
"local_username" : "${spark2-env/spark_user}"
},
"keytab": {
-"file": "${keytab_dir}/spark2.headless.keytab",
+"file": "${keytab_dir}/spark.headless.keytab",
"owner": {
"name": "${spark2-env/spark_user}",
"access": "r"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e65407ec/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 01ee87e..36513f2 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
@@ -15,7 +15,7 @@
"local_username" : "${spark2-env/spark_user}"
},
"keytab": {
-"file": "${keytab_dir}/spark2.headless.keytab",
+"file": "${keytab_dir}/spark.headless.keytab",
"owner": {
"name": "${spark2-env/spark_user}",
"access": "r"
[1/2] ambari git commit: AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with keytab file does not exist error (Attila Magyar via adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 d8cce33cc -> e65407ecb
refs/heads/trunk f79a48b2e -> 266d81c44
AMBARI-20140. Adding spark2 to a kerberized cluster with spark1 fails with
keytab file does not exist error (Attila Magyar via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/266d81c4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/266d81c4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/266d81c4
Branch: refs/heads/trunk
Commit: 266d81c44d2a01600ee2235091c85bee204efa23
Parents: f79a48b
Author: Attila Magyar
Authored: Wed Mar 1 15:35:08 2017 +0100
Committer: Attila Doroszlai
Committed: Wed Mar 1 15:35:08 2017 +0100
--
.../src/main/resources/common-services/SPARK2/2.0.0/kerberos.json | 2 +-
.../main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/266d81c4/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json
--
diff --git
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json
index cf7eeba..a787d33 100755
---
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json
+++
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json
@@ -15,7 +15,7 @@
"local_username" : "${spark2-env/spark_user}"
},
"keytab": {
-"file": "${keytab_dir}/spark2.headless.keytab",
+"file": "${keytab_dir}/spark.headless.keytab",
"owner": {
"name": "${spark2-env/spark_user}",
"access": "r"
http://git-wip-us.apache.org/repos/asf/ambari/blob/266d81c4/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 01ee87e..36513f2 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
@@ -15,7 +15,7 @@
"local_username" : "${spark2-env/spark_user}"
},
"keytab": {
-"file": "${keytab_dir}/spark2.headless.keytab",
+"file": "${keytab_dir}/spark.headless.keytab",
"owner": {
"name": "${spark2-env/spark_user}",
"access": "r"
[1/2] ambari git commit: AMBARI-20285. Spark2 Thrift Server stops due incompletely uploaded spark2-hdp-yarn-archive.tar.gz
Repository: ambari Updated Branches: refs/heads/branch-2.5 d567127ae -> d14bd4560 refs/heads/trunk 0e4819ae7 -> 07076bd76 AMBARI-20285. Spark2 Thrift Server stops due incompletely uploaded spark2-hdp-yarn-archive.tar.gz Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/07076bd7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/07076bd7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/07076bd7 Branch: refs/heads/trunk Commit: 07076bd769c0ce73430af9b79f77b0d021648046 Parents: 0e4819a Author: Attila Doroszlai Authored: Thu Mar 2 15:42:03 2017 +0100 Committer: Attila Doroszlai Committed: Fri Mar 3 11:12:41 2017 +0100 -- .../common-services/SPARK2/2.0.0/package/scripts/spark_service.py | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/07076bd7/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py -- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py index 12988c8..c8a2b33 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py @@ -41,9 +41,11 @@ def make_tarfile(output_filename, source_dir): parent_dir=os.path.dirname(output_filename) if not os.path.exists(parent_dir): os.makedirs(parent_dir) +os.chmod(parent_dir, 0711) with closing(tarfile.open(output_filename, "w:gz")) as tar: for file in os.listdir(source_dir): tar.add(os.path.join(source_dir,file),arcname=file) + os.chmod(output_filename, 0644) def spark_service(name, upgrade_type=None, action=None):
[2/2] ambari git commit: AMBARI-20285. Spark2 Thrift Server stops due incompletely uploaded spark2-hdp-yarn-archive.tar.gz
AMBARI-20285. Spark2 Thrift Server stops due incompletely uploaded spark2-hdp-yarn-archive.tar.gz Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d14bd456 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d14bd456 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d14bd456 Branch: refs/heads/branch-2.5 Commit: d14bd456025962f5470d780bc6e27bf52450e19e Parents: d567127 Author: Attila Doroszlai Authored: Thu Mar 2 15:42:03 2017 +0100 Committer: Attila Doroszlai Committed: Fri Mar 3 11:13:20 2017 +0100 -- .../common-services/SPARK2/2.0.0/package/scripts/spark_service.py | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/d14bd456/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py -- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py index 89edfb5..3efd1b7 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py @@ -41,9 +41,11 @@ def make_tarfile(output_filename, source_dir): parent_dir=os.path.dirname(output_filename) if not os.path.exists(parent_dir): os.makedirs(parent_dir) +os.chmod(parent_dir, 0711) with closing(tarfile.open(output_filename, "w:gz")) as tar: for file in os.listdir(source_dir): tar.add(os.path.join(source_dir,file),arcname=file) + os.chmod(output_filename, 0644) def spark_service(name, upgrade_type=None, action=None):
[1/2] ambari git commit: AMBARI-20070. Agent heartbeat lost due to subprocess.Popen race condition -- addendum for multiprocessing
Repository: ambari Updated Branches: refs/heads/branch-2.5 09fcf9b07 -> 7794d1326 refs/heads/trunk 9446252fa -> 19c9e2558 AMBARI-20070. Agent heartbeat lost due to subprocess.Popen race condition -- addendum for multiprocessing Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/19c9e255 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/19c9e255 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/19c9e255 Branch: refs/heads/trunk Commit: 19c9e25587316bceb46c1585fce712fdf5056e39 Parents: 9446252 Author: Attila Doroszlai Authored: Sat Mar 11 19:13:16 2017 +0100 Committer: Attila Doroszlai Committed: Mon Mar 13 22:21:59 2017 +0100 -- .../src/main/python/ambari_agent/main.py| 21 ++-- 1 file changed, 15 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/19c9e255/ambari-agent/src/main/python/ambari_agent/main.py -- diff --git a/ambari-agent/src/main/python/ambari_agent/main.py b/ambari-agent/src/main/python/ambari_agent/main.py index ddef473..8e55916 100644 --- a/ambari-agent/src/main/python/ambari_agent/main.py +++ b/ambari-agent/src/main/python/ambari_agent/main.py @@ -45,23 +45,32 @@ def fix_subprocess_racecondition(): def fix_subprocess_popen(): ''' - http://bugs.python.org/issue19809 + Workaround for race condition in starting subprocesses concurrently from + multiple threads via the subprocess and multiprocessing modules. + See http://bugs.python.org/issue19809 for details and repro script. ''' import os import sys if os.name == 'posix' and sys.version_info[0] < 3: +from multiprocessing import forking import subprocess import threading -original_init = subprocess.Popen.__init__ -lock = threading.RLock() +sp_original_init = subprocess.Popen.__init__ +mp_original_init = forking.Popen.__init__ +lock = threading.RLock() # guards subprocess creation -def locked_init(self, *a, **kw): +def sp_locked_init(self, *a, **kw): with lock: -original_init(self, *a, **kw) +sp_original_init(self, *a, **kw) -subprocess.Popen.__init__ = locked_init +def mp_locked_init(self, *a, **kw): + with lock: +mp_original_init(self, *a, **kw) + +subprocess.Popen.__init__ = sp_locked_init +forking.Popen.__init__ = mp_locked_init fix_subprocess_popen()
[2/2] ambari git commit: AMBARI-20070. Agent heartbeat lost due to subprocess.Popen race condition -- addendum for multiprocessing
AMBARI-20070. Agent heartbeat lost due to subprocess.Popen race condition -- addendum for multiprocessing Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7794d132 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7794d132 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7794d132 Branch: refs/heads/branch-2.5 Commit: 7794d1326f075bd1c7e8a3ce5a8eb62c48154d8a Parents: 09fcf9b Author: Attila Doroszlai Authored: Sat Mar 11 19:13:16 2017 +0100 Committer: Attila Doroszlai Committed: Mon Mar 13 22:22:14 2017 +0100 -- .../src/main/python/ambari_agent/main.py| 21 ++-- 1 file changed, 15 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/7794d132/ambari-agent/src/main/python/ambari_agent/main.py -- diff --git a/ambari-agent/src/main/python/ambari_agent/main.py b/ambari-agent/src/main/python/ambari_agent/main.py index bbed123..604b234 100644 --- a/ambari-agent/src/main/python/ambari_agent/main.py +++ b/ambari-agent/src/main/python/ambari_agent/main.py @@ -45,23 +45,32 @@ def fix_subprocess_racecondition(): def fix_subprocess_popen(): ''' - http://bugs.python.org/issue19809 + Workaround for race condition in starting subprocesses concurrently from + multiple threads via the subprocess and multiprocessing modules. + See http://bugs.python.org/issue19809 for details and repro script. ''' import os import sys if os.name == 'posix' and sys.version_info[0] < 3: +from multiprocessing import forking import subprocess import threading -original_init = subprocess.Popen.__init__ -lock = threading.RLock() +sp_original_init = subprocess.Popen.__init__ +mp_original_init = forking.Popen.__init__ +lock = threading.RLock() # guards subprocess creation -def locked_init(self, *a, **kw): +def sp_locked_init(self, *a, **kw): with lock: -original_init(self, *a, **kw) +sp_original_init(self, *a, **kw) -subprocess.Popen.__init__ = locked_init +def mp_locked_init(self, *a, **kw): + with lock: +mp_original_init(self, *a, **kw) + +subprocess.Popen.__init__ = sp_locked_init +forking.Popen.__init__ = mp_locked_init fix_subprocess_popen()
ambari git commit: AMBARI-20525. Unlimited Key JCE policy is enabled or not on each host (Attila Magyar via adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/trunk cd751ef1a -> 550752deb
AMBARI-20525. Unlimited Key JCE policy is enabled or not on each host (Attila
Magyar via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/550752de
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/550752de
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/550752de
Branch: refs/heads/trunk
Commit: 550752deb2d6508f5aa97c9270a0bb9785104b2c
Parents: cd751ef
Author: Attila Magyar
Authored: Mon Mar 27 15:24:58 2017 +0200
Committer: Attila Doroszlai
Committed: Mon Mar 27 15:29:51 2017 +0200
--
.../src/main/python/ambari_agent/HostInfo.py| 14 ++-
.../test/python/ambari_agent/TestHostInfo.py| 4 +++-
.../core/resources/jcepolicyinfo.py | 25
.../apache/ambari/server/agent/AgentEnv.java| 6 +
.../server/configuration/Configuration.java | 1 +
.../scripts/shared_initialization.py| 2 +-
.../scripts/shared_initialization.py| 2 +-
.../ambari/server/agent/AgentResourceTest.java | 3 ++-
.../app/controllers/global/update_controller.js | 2 +-
ambari-web/app/mappers/hosts_mapper.js | 1 +
ambari-web/app/messages.js | 1 +
ambari-web/app/models/host.js | 1 +
ambari-web/app/templates/main/host/summary.hbs | 4
13 files changed, 45 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/550752de/ambari-agent/src/main/python/ambari_agent/HostInfo.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
index 7f041eb..4b7bfd7 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
@@ -33,7 +33,8 @@ from ambari_commons.os_family_impl import OsFamilyImpl
from resource_management.core import shell
from ambari_agent.HostCheckReportFileHandler import HostCheckReportFileHandler
-
+from AmbariConfig import AmbariConfig
+from resource_management.core.resources.jcepolicyinfo import JcePolicyInfo
logger = logging.getLogger()
@@ -285,6 +286,16 @@ class HostInfoLinux(HostInfo):
result['target'] = realConf
etcResults.append(result)
+ def checkUnlimitedJce(self):
+if not self.config or not
self.config.has_option(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, 'java.home'):
+ return None
+try:
+ jcePolicyInfo =
JcePolicyInfo(self.config.get(AmbariConfig.AMBARI_PROPERTIES_CATEGORY,
'java.home'))
+ return jcePolicyInfo.is_unlimited_key_jce_policy()
+except:
+ logger.exception('Unable to get information about JCE')
+ return None
+
def register(self, dict, componentsMapped=True, commandsInProgress=True):
""" Return various details about the host
componentsMapped: indicates if any components are mapped to this host
@@ -307,6 +318,7 @@ class HostInfoLinux(HostInfo):
dict['firewallRunning'] = self.checkFirewall()
dict['firewallName'] = self.getFirewallName()
dict['reverseLookup'] = self.checkReverseLookup()
+dict['hasUnlimitedJcePolicy'] = self.checkUnlimitedJce()
# If commands are in progress or components are already mapped to this host
# Then do not perform certain expensive host checks
if componentsMapped or commandsInProgress:
http://git-wip-us.apache.org/repos/asf/ambari/blob/550752de/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
index 67294e0..a00771d 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
@@ -198,7 +198,8 @@ class TestHostInfo(TestCase):
@patch.object(HostInfoLinux, 'hadoopVarRunCount')
@patch.object(HostInfoLinux, 'hadoopVarLogCount')
@patch.object(HostInfoLinux, 'checkFirewall')
- def test_hostinfo_register_suse(self, cit_mock, hvlc_mock, hvrc_mock,
eac_mock, cf_mock, jp_mock,
+ @patch.object(HostInfoLinux, 'checkUnlimitedJce')
+ def test_hostinfo_register_suse(self, jce_mock, cit_mock, hvlc_mock,
hvrc_mock, eac_mock, cf_mock, jp_mock,
cls_mock, cu_mock, gir_mock, gipbr_mock,
gipbn_mock,
gpd_mock, aip_mock, aap_mock, whcf_mock,
os_umask_mock, get_os_type_mock):
cit_mock.return_value = True
@@ -215,6 +21
[32/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
AMBARI-19149. Code cleanup: redundant type arguments Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/edbb5492 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/edbb5492 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/edbb5492 Branch: refs/heads/trunk Commit: edbb549206a0a48b9e6619fa702fd7f5a8d451aa Parents: ec1505f Author: Attila Doroszlai Authored: Wed Mar 29 12:57:55 2017 +0200 Committer: Attila Doroszlai Committed: Wed Mar 29 14:42:14 2017 +0200 -- .../server/KdcServerConnectionVerification.java | 31 +- .../java/org/apache/ambari/server/Role.java |2 +- .../actionmanager/ActionDBAccessorImpl.java | 14 +- .../server/actionmanager/ActionManager.java |2 +- .../server/actionmanager/ActionScheduler.java | 30 +- .../ambari/server/actionmanager/Request.java| 10 +- .../ambari/server/actionmanager/Stage.java | 22 +- .../apache/ambari/server/agent/ActionQueue.java | 12 +- .../ambari/server/agent/AgentRequests.java |2 +- .../ambari/server/agent/ExecutionCommand.java | 10 +- .../apache/ambari/server/agent/HeartBeat.java |6 +- .../ambari/server/agent/HeartBeatHandler.java | 14 +- .../ambari/server/agent/HeartBeatResponse.java | 10 +- .../ambari/server/agent/HeartbeatMonitor.java |6 +- .../ambari/server/agent/HeartbeatProcessor.java |2 +- .../apache/ambari/server/agent/HostInfo.java|2 +- .../ambari/server/agent/RecoveryReport.java |2 +- .../server/agent/RegistrationResponse.java |2 +- .../ambari/server/agent/StatusCommand.java |4 +- .../alerts/AmbariPerformanceRunnable.java |2 +- .../server/alerts/StaleAlertRunnable.java |2 +- .../server/api/AmbariCsrfProtectionFilter.java |2 +- .../ambari/server/api/AmbariErrorHandler.java |2 +- .../server/api/handlers/QueryCreateHandler.java |6 +- .../ambari/server/api/predicate/QueryLexer.java | 24 +- .../server/api/predicate/QueryParser.java |8 +- .../expressions/AbstractExpression.java |2 +- .../expressions/NotLogicalExpression.java |2 +- .../api/predicate/operators/EqualsOperator.java |2 +- .../operators/GreaterEqualsOperator.java|2 +- .../predicate/operators/GreaterOperator.java|2 +- .../api/predicate/operators/InOperator.java |2 +- .../predicate/operators/LessEqualsOperator.java |2 +- .../api/predicate/operators/LessOperator.java |2 +- .../predicate/operators/NotEqualsOperator.java |2 +- .../query/ExtendedResourcePredicateVisitor.java |2 +- .../server/api/query/JpaPredicateVisitor.java |4 +- .../ambari/server/api/query/JpaSortBuilder.java |2 +- .../api/query/ProcessingPredicateVisitor.java |6 +- .../ambari/server/api/query/QueryImpl.java | 60 +- .../ambari/server/api/query/QueryInfo.java |2 +- .../api/query/SubResourcePredicateVisitor.java |2 +- .../render/AlertSummaryGroupedRenderer.java |6 +- .../api/query/render/AlertSummaryRenderer.java |4 +- .../server/api/query/render/BaseRenderer.java |2 +- .../query/render/ClusterBlueprintRenderer.java | 36 +- .../api/query/render/DefaultRenderer.java |4 +- .../api/query/render/MinimalRenderer.java | 10 +- .../api/resources/BaseResourceDefinition.java |8 +- .../resources/ClusterResourceDefinition.java|2 +- ...ComponentStackVersionResourceDefinition.java |2 +- .../ExtensionLinkResourceDefinition.java|2 +- .../resources/ExtensionResourceDefinition.java |2 +- .../ExtensionVersionResourceDefinition.java |2 +- .../api/resources/FeedResourceDefinition.java |2 +- .../api/resources/GroupResourceDefinition.java |2 +- .../HostComponentResourceDefinition.java|4 +- .../api/resources/JobResourceDefinition.java|2 +- .../resources/PermissionResourceDefinition.java |2 +- .../resources/ResourceInstanceFactoryImpl.java |2 +- ...tServiceHostComponentResourceDefinition.java |2 +- .../RootServiceResourceDefinition.java |2 +- .../resources/ServiceResourceDefinition.java|2 +- .../StackConfigurationResourceDefinition.java |2 +- ...ackLevelConfigurationResourceDefinition.java |2 +- .../api/resources/StackResourceDefinition.java |2 +- .../StackServiceResourceDefinition.java |2 +- .../StackVersionResourceDefinition.java |2 +- .../api/resources/UserResourceDefinition.java |2 +- .../ViewInstanceResourceDefinition.java |2 +- .../ViewVersionResourceDefinition.java |2 +- .../resources/WorkflowResourceDefinition.java |2 +- .../server/api/rest/BootStrapResource.java |4 +- .../api/services/ActiveWidgetLayoutService.java |2 +- .../api/servi
[08/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java
index 3e1c4c5..6fd1a23 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java
@@ -52,7 +52,7 @@ public class JobResourceProviderTest {
public void testGetResources() throws SystemException,
UnsupportedPropertyException, NoSuchResourceException,
NoSuchParentResourceException {
-Set expected = new HashSet();
+Set expected = new HashSet<>();
expected.add(createJobResponse("Cluster100", "workflow1", "job1"));
expected.add(createJobResponse("Cluster100", "workflow2", "job2"));
expected.add(createJobResponse("Cluster100", "workflow2", "job3"));
@@ -77,7 +77,7 @@ public class JobResourceProviderTest {
Set resources = provider.getResources(request, predicate);
Assert.assertEquals(3, resources.size());
-Set names = new HashSet();
+Set names = new HashSet<>();
for (Resource resource : resources) {
String clusterName = (String) resource
.getPropertyValue(JobResourceProvider.JOB_CLUSTER_NAME_PROPERTY_ID);
@@ -98,7 +98,7 @@ public class JobResourceProviderTest {
public void testJobFetcher1() throws SystemException,
UnsupportedPropertyException, NoSuchResourceException,
NoSuchParentResourceException {
-Set requestedIds = new HashSet();
+Set requestedIds = new HashSet<>();
requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID);
Map keyPropertyIds = PropertyHelper
@@ -124,7 +124,7 @@ public class JobResourceProviderTest {
public void testJobFetcher2() throws SystemException,
UnsupportedPropertyException, NoSuchResourceException,
NoSuchParentResourceException {
-Set requestedIds = new HashSet();
+Set requestedIds = new HashSet<>();
requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID);
requestedIds.add(JobResourceProvider.JOB_SUBMIT_TIME_PROPERTY_ID);
@@ -153,7 +153,7 @@ public class JobResourceProviderTest {
public void testJobFetcher3() throws SystemException,
UnsupportedPropertyException, NoSuchResourceException,
NoSuchParentResourceException {
-Set requestedIds = new HashSet();
+Set requestedIds = new HashSet<>();
requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID);
requestedIds.add(JobResourceProvider.JOB_ELAPSED_TIME_PROPERTY_ID);
@@ -182,7 +182,7 @@ public class JobResourceProviderTest {
public void testJobFetcher4() throws SystemException,
UnsupportedPropertyException, NoSuchResourceException,
NoSuchParentResourceException {
-Set requestedIds = new HashSet();
+Set requestedIds = new HashSet<>();
requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID);
requestedIds.add(JobResourceProvider.JOB_SUBMIT_TIME_PROPERTY_ID);
requestedIds.add(JobResourceProvider.JOB_ELAPSED_TIME_PROPERTY_ID);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java
index 7660c2a..5229d3d 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java
@@ -53,10 +53,10 @@ public class LdapSyncEventResourceProviderTest {
LdapSyncEventResourceProvider provider = new
TestLdapSyncEventResourceProvider(amc);
-Set> properties = new HashSet>();
-Map propertyMap = new HashMap();
+Set> properties = new HashSet<>();
+Map propertyMap = new HashMap<>();
-Set> specs = new HashSet>();
+Set> specs = new HashSet<>();
propertyMap.put(LdapSyncEventResourceProvider.EVENT_SPECS_PROPERTY_ID,
specs);
properties.add(propertyMap);
@@ -73,10 +73,10 @@ public class LdapSyncEventResourceProviderTest {
LdapSyncEventResourceProvider provider = new
TestLdapSyncEventResourceProvider(amc);
-Set> properties = new HashSet>();
-Map propertyMap = new HashMap();
+Set> properties = new HashSet<>();
+Map propertyMap = new HashMap<>();
-Set> specs = n
[19/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintFactory.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintFactory.java
b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintFactory.java
index 3c5314b..40fa2d3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintFactory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintFactory.java
@@ -137,7 +137,7 @@ public class BlueprintFactory {
throw new IllegalArgumentException("At least one host group must be
specified in a blueprint");
}
-Collection hostGroups = new ArrayList();
+Collection hostGroups = new ArrayList<>();
for (HashMap hostGroupProperties : hostGroupProps) {
String hostGroupName = (String)
hostGroupProperties.get(HOST_GROUP_NAME_PROPERTY_ID);
if (hostGroupName == null || hostGroupName.isEmpty()) {
@@ -167,7 +167,7 @@ public class BlueprintFactory {
}
Collection stackComponentNames = getAllStackComponents(stack);
-Collection components = new ArrayList();
+Collection components = new ArrayList<>();
for (HashMap componentProperties : componentProps) {
String componentName =
componentProperties.get(COMPONENT_NAME_PROPERTY_ID);
@@ -200,7 +200,7 @@ public class BlueprintFactory {
* @throws IllegalArgumentException if the specified stack doesn't exist
*/
private Collection getAllStackComponents(Stack stack) {
-Collection allComponents = new HashSet();
+Collection allComponents = new HashSet<>();
for (Collection components: stack.getComponents().values()) {
allComponents.addAll(components);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
index faf0c77..c90e35c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
@@ -49,7 +49,7 @@ import com.google.gson.Gson;
public class BlueprintImpl implements Blueprint {
private String name;
- private Map hostGroups = new HashMap();
+ private Map hostGroups = new HashMap<>();
private Stack stack;
private Configuration configuration;
private BlueprintValidator validator;
@@ -142,7 +142,7 @@ public class BlueprintImpl implements Blueprint {
*/
@Override
public Collection getServices() {
-Collection services = new HashSet();
+Collection services = new HashSet<>();
for (HostGroup group : getHostGroups().values()) {
services.addAll(group.getServices());
}
@@ -151,7 +151,7 @@ public class BlueprintImpl implements Blueprint {
@Override
public Collection getComponents(String service) {
-Collection components = new HashSet();
+Collection components = new HashSet<>();
for (HostGroup group : getHostGroupsForService(service)) {
components.addAll(group.getComponents(service));
}
@@ -286,7 +286,7 @@ public class BlueprintImpl implements Blueprint {
*/
@Override
public Collection getHostGroupsForComponent(String component) {
-Collection resultGroups = new HashSet();
+Collection resultGroups = new HashSet<>();
for (HostGroup group : hostGroups.values() ) {
if (group.getComponentNames().contains(component)) {
resultGroups.add(group);
@@ -304,7 +304,7 @@ public class BlueprintImpl implements Blueprint {
*/
@Override
public Collection getHostGroupsForService(String service) {
-Collection resultGroups = new HashSet();
+Collection resultGroups = new HashSet<>();
for (HostGroup group : hostGroups.values() ) {
if (group.getServices().contains(service)) {
resultGroups.add(group);
@@ -404,7 +404,7 @@ public class BlueprintImpl implements Blueprint {
*/
private Map>
parseConfigurations(Collection configs) {
-Map> properties = new HashMap>();
+Map> properties = new HashMap<>();
Gson gson = new Gson();
for (BlueprintConfiguration config : configs) {
String type = config.getType();
@@ -422,7 +422,7 @@ public class BlueprintImpl implements Blueprint {
*/
private Map>>
parseSetting(Collection blueprintSetting) {
-Map>> properties = new HashMap>>();
+Map>> properties = new HashMap<>();
Gson gson = new Gson();
for (BlueprintSettingEntity setting : blueprintSetting) {
String settingName = setting.getSettingName();
@@ -441,7 +441,7 @@ public class BlueprintImpl implements B
[17/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
index 718c7ce..2b5d2f3 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
@@ -196,7 +196,7 @@ public class TestActionScheduler {
Host host = mock(Host.class);
HashMap hosts =
-new HashMap();
+ new HashMap<>();
hosts.put(hostname, sch);
HostEntity hostEntity = new HostEntity();
hostEntity.setHostName(hostname);
@@ -210,7 +210,7 @@ public class TestActionScheduler {
ActionDBAccessor db = mock(ActionDBAccessorImpl.class);
HostRoleCommandDAO hostRoleCommandDAOMock = mock(HostRoleCommandDAO.class);
Mockito.doNothing().when(hostRoleCommandDAOMock).publishTaskCreateEvent(anyListOf(HostRoleCommand.class));
-List stages = new ArrayList();
+List stages = new ArrayList<>();
Stage s = StageUtils.getATestStage(1, 977, hostname, CLUSTER_HOST_INFO,
"{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}");
stages.add(s);
@@ -295,7 +295,7 @@ public class TestActionScheduler {
when(serviceObj.getCluster()).thenReturn(oneClusterMock);
Host host = mock(Host.class);
HashMap hosts =
-new HashMap();
+ new HashMap<>();
hosts.put(hostname, sch);
when(scomp.getServiceComponentHosts()).thenReturn(hosts);
@@ -307,7 +307,7 @@ public class TestActionScheduler {
hostEntity.setHostName(hostname);
hostDAO.create(hostEntity);
-List stages = new ArrayList();
+List stages = new ArrayList<>();
final Stage s = StageUtils.getATestStage(1, 977, hostname,
CLUSTER_HOST_INFO,
"{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}");
s.addHostRoleExecutionCommand(hostname, Role.SECONDARY_NAMENODE,
RoleCommand.INSTALL,
@@ -389,7 +389,7 @@ public class TestActionScheduler {
when(serviceObj.getCluster()).thenReturn(oneClusterMock);
Host host = mock(Host.class);
HashMap hosts =
-new HashMap();
+ new HashMap<>();
hosts.put(hostname, sch);
when(scomp.getServiceComponentHosts()).thenReturn(hosts);
@@ -397,7 +397,7 @@ public class TestActionScheduler {
when(host.getState()).thenReturn(HostState.HEARTBEAT_LOST);
when(host.getHostName()).thenReturn(hostname);
-final List stages = new ArrayList();
+final List stages = new ArrayList<>();
final Stage s = StageUtils.getATestStage(1, 977, hostname,
CLUSTER_HOST_INFO,
"{\"host_param\":\"param_value\"}", "{\"stage_param\":\"param_value\"}");
stages.add(s);
@@ -464,7 +464,7 @@ public class TestActionScheduler {
hostDAO.merge(hostEntity2);
HashMap hosts =
-new HashMap();
+ new HashMap<>();
hosts.put(hostname1, sch1);
hosts.put(hostname2, sch2);
when(scomp.getServiceComponentHosts()).thenReturn(hosts);
@@ -484,7 +484,7 @@ public class TestActionScheduler {
when(serviceObj.getServiceComponent(anyString())).thenReturn(scomp);
when(serviceObj.getCluster()).thenReturn(oneClusterMock);
-final List stages = new ArrayList();
+final List stages = new ArrayList<>();
final Stage stage = stageFactory.createNew(1, "/tmp", "cluster1", 1L,
"stageWith2Tasks",
CLUSTER_HOST_INFO, "{\"command_param\":\"param_value\"}",
"{\"host_param\":\"param_value\"}");
addInstallTaskToStage(stage, hostname1, "cluster1", Role.DATANODE,
@@ -606,8 +606,8 @@ public class TestActionScheduler {
Clusters fsm = mock(Clusters.class);
UnitOfWork unitOfWork = mock(UnitOfWork.class);
-List stages = new ArrayList();
-Map payload = new HashMap();
+List stages = new ArrayList<>();
+Map payload = new HashMap<>();
final Stage s = getStageWithServerAction(1, 977, payload, "test", 1200,
false, false);
stages.add(s);
@@ -704,13 +704,13 @@ public class TestActionScheduler {
String hostname1 = "ahost.ambari.apache.org";
String hostname2 = "bhost.ambari.apache.org";
HashMap hosts =
-new HashMap();
+ new HashMap<>();
hosts.put(hostname1, sch);
hosts.put(hostname2, sch);
hosts.put(Stage.INTERNAL_HOSTNAME, sch);
when(scomp.getServiceComponentHosts()).thenReturn(hosts);
-List stages = new ArrayList();
+List stages = new ArrayList<>();
Stage stage01 = createStage(clusterName, 0, 1);
addTask(stage01, Stage.INTERNAL_HOSTNAME, clusterName,
Role.AMBARI_SERVER_ACTION, RoleCommand.ACTIONEXECUTE, "AMBARI", 1);
@@ -766,8 +766,8 @@ public class TestAc
[01/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
Repository: ambari
Updated Branches:
refs/heads/trunk ec1505f21 -> edbb54920
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
index 013023d..daabcb3 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
@@ -288,7 +288,7 @@ public class ViewRegistryTest {
for (ViewInstanceEntity viewInstanceEntity : viewInstanceEntities) {
viewInstanceEntity.putInstanceData("p1", "v1");
- Collection entities = new HashSet();
+ Collection entities = new HashSet<>();
ViewEntityEntity viewEntityEntity = new ViewEntityEntity();
viewEntityEntity.setId(99L);
viewEntityEntity.setIdProperty("id");
@@ -313,7 +313,7 @@ public class ViewRegistryTest {
viewInstanceEntity.setResource(resourceEntity);
}
-Map files = new HashMap();
+Map files = new HashMap<>();
if (System.getProperty("os.name").contains("Windows")) {
files.put("\\var\\lib\\ambari-server\\resources\\views\\work",
extractedArchiveDir);
files.put("\\var\\lib\\ambari-server\\resources\\views\\work\\MY_VIEW{1.0.0}",
archiveDir);
@@ -331,10 +331,10 @@ public class ViewRegistryTest {
files.put("/var/lib/ambari-server/resources/views/work/MY_VIEW{1.0.0}/META-INF",
metaInfDir);
}
-Map outputStreams = new HashMap();
+Map outputStreams = new HashMap<>();
outputStreams.put(entryFile, fos);
-Map jarFiles = new HashMap();
+Map jarFiles = new HashMap<>();
jarFiles.put(viewArchive, viewJarFile);
// set expectations
@@ -414,7 +414,7 @@ public class ViewRegistryTest {
expect(autoInstanceDataEntity.getName()).andReturn("p1").anyTimes();
expect(autoInstanceDataEntity.getUser()).andReturn(" ").anyTimes();
-Map serviceMap = new HashMap();
+Map serviceMap = new HashMap<>();
serviceMap.put("HDFS", service);
serviceMap.put("HIVE", service);
@@ -422,7 +422,7 @@ public class ViewRegistryTest {
StackId stackId = new StackId("HDP-2.0");
if(checkAutoInstanceCreation) {
- Map allClusters = new HashMap();
+ Map allClusters = new HashMap<>();
expect(cluster.getClusterName()).andReturn("c1").anyTimes();
expect(cluster.getCurrentStackVersion()).andReturn(stackId).anyTimes();
expect(cluster.getServices()).andReturn(serviceMap).anyTimes();
@@ -542,7 +542,7 @@ public class ViewRegistryTest {
viewInstanceEntity.setResource(resourceEntity);
}
-Map files = new HashMap();
+Map files = new HashMap<>();
if (System.getProperty("os.name").contains("Windows")) {
files.put("\\var\\lib\\ambari-server\\resources\\views\\work",
extractedArchiveDir);
@@ -561,10 +561,10 @@ public class ViewRegistryTest {
files.put("/var/lib/ambari-server/resources/views/work/MY_VIEW{1.0.0}/META-INF",
metaInfDir);
}
-Map outputStreams = new HashMap();
+Map outputStreams = new HashMap<>();
outputStreams.put(entryFile, fos);
-Map jarFiles = new HashMap();
+Map jarFiles = new HashMap<>();
jarFiles.put(viewArchive, viewJarFile);
// set expectations
@@ -831,7 +831,7 @@ public class ViewRegistryTest {
Assert.assertEquals(3, subResourceDefinitions.size());
-Set names = new HashSet();
+Set names = new HashSet<>();
for (SubResourceDefinition definition : subResourceDefinitions) {
names.add(definition.getType().name());
}
@@ -1102,7 +1102,7 @@ public class ViewRegistryTest {
ViewInstanceEntity viewInstanceEntity = getViewInstanceEntity(viewEntity,
config.getInstances().get(0));
-Map instanceProperties = new HashMap();
+Map instanceProperties = new HashMap<>();
instanceProperties.put("p1", "newV1");
instanceProperties.put("p2", "newV2");
@@ -1339,7 +1339,7 @@ public class ViewRegistryTest {
ResourceEntity resourceEntity = createNiceMock(ResourceEntity.class);
ResourceTypeEntity resourceTypeEntity =
createNiceMock(ResourceTypeEntity.class);
-Collection instances = new
ArrayList();
+Collection instances = new ArrayList<>();
instances.add(instanceEntity);
expect(viewEntity.getInstances()).andReturn(instances);
@@ -1360,7 +1360,7 @@ public class ViewRegistryTest {
@Test
public void testOnAmbariEventServiceCreation() throws Exception {
-Set serviceNames = new HashSet();
+Set serviceNames = new HashSet<>();
serviceNames.add("HDFS");
serviceNames.add("HIVE");
@@ -1369,7 +1369,7 @@ public class ViewRegistryTest {
@Test
public void testOnAmbariEventServiceCreation_widcar
[18/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
index 3d263cf..c235cf8 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
@@ -393,7 +393,7 @@ public class UpgradeCatalog221 extends
AbstractUpgradeCatalog {
VersionUtils.compareVersions(stackId.getStackVersion(), "2.3") >=
0);
if (isStackNotLess23) {
- Map updates = new HashMap();
+ Map updates = new HashMap<>();
if (tezCountersMaxProperty != null &&
tezCountersMaxProperty.equals("2000")) {
updates.put(TEZ_COUNTERS_MAX, "1");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
index ab3b493..f0f9253 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
@@ -226,7 +226,7 @@ public class UpgradeCatalog222 extends
AbstractUpgradeCatalog {
if (zooEnv != null &&
zooEnv.getProperties().containsKey("zk_server_heapsize")) {
String heapSizeValue =
zooEnv.getProperties().get("zk_server_heapsize");
if(!heapSizeValue.endsWith("m")) {
- Map updates = new HashMap();
+ Map updates = new HashMap<>();
updates.put("zk_server_heapsize", heapSizeValue+"m");
updateConfigurationPropertiesForCluster(cluster, "zookeeper-env",
updates, true, false);
}
@@ -290,7 +290,7 @@ public class UpgradeCatalog222 extends
AbstractUpgradeCatalog {
for (final Cluster cluster : clusterMap.values()) {
if (cluster.getDesiredConfigByType("storm-site") != null &&
cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("storm.zookeeper.superACL")
&&
cluster.getDesiredConfigByType("storm-site").getProperties().get("storm.zookeeper.superACL").equals("sasl:{{storm_base_jaas_principal}}"))
{
-Map newStormProps = new HashMap();
+Map newStormProps = new HashMap<>();
newStormProps.put("storm.zookeeper.superACL",
"sasl:{{storm_bare_jaas_principal}}");
updateConfigurationPropertiesForCluster(cluster, "storm-site",
newStormProps, true, false);
}
@@ -669,7 +669,7 @@ public class UpgradeCatalog222 extends
AbstractUpgradeCatalog {
VersionUtils.compareVersions(stackId.getStackVersion(), "2.3") >= 0);
List atlasHost =
cluster.getServiceComponentHosts("ATLAS", "ATLAS_SERVER");
- Map updates = new HashMap();
+ Map updates = new HashMap<>();
if (isStackNotLess23 && atlasHost.size() != 0 && hiveSiteConfig != null)
{
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog230.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog230.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog230.java
index 6cda590..a53ac95 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog230.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog230.java
@@ -279,7 +279,7 @@ public class UpgradeCatalog230 extends
AbstractUpgradeCatalog {
Collection administratorOnly =
Collections.singleton(administratorPermission);
// A map of the authorizations to the relevant roles
-Map> map = new HashMap>();
+Map> map = new HashMap<>();
map.put("VIEW.USE", viewUserAndAdministrator);
map.put("SERVICE.VIEW_METRICS", clusterUserAndUp);
map.put("SERVICE.VIEW_STATUS_INFO", clusterUserAndUp);
@@ -351,14 +351,14 @@ public class UpgradeCatalog230 extends
AbstractUpgradeCatalog {
// Add roleauthorization table
LOG.info("Creating " + ROLE_AUTHORIZATION_TABLE + " table");
-columns = new ArrayList();
+columns = new ArrayList<>();
columns.add(new DBColumnInfo(ROLE_AUTHORIZATION_ID_COL, String.class, 100,
null, false));
columns.add(new DBColumnInfo(ROLE_AUTHORIZATION_NAME_COL, String.class,
255, null, false));
dbAccessor.createTable(ROLE_AUTHORIZATION_TABLE, column
[11/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 fa2082b..54d4fcc 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
@@ -80,7 +80,7 @@ import com.google.common.collect.Maps;
public class BlueprintConfigurationProcessorTest {
private static final Configuration EMPTY_CONFIG = new
Configuration(Collections.>emptyMap(),
Collections.>>emptyMap());
- private final Map> serviceComponents = new
HashMap>();
+ private final Map> serviceComponents = new
HashMap<>();
@Rule
public EasyMockRule mocks = new EasyMockRule(this);
@@ -112,73 +112,73 @@ public class BlueprintConfigurationProcessorTest {
Collections.emptyMap()).anyTimes();
expect(serviceInfo.getRequiredServices()).andReturn(Collections.emptyList()).anyTimes();
-Collection hdfsComponents = new HashSet();
+Collection hdfsComponents = new HashSet<>();
hdfsComponents.add("NAMENODE");
hdfsComponents.add("SECONDARY_NAMENODE");
hdfsComponents.add("DATANODE");
hdfsComponents.add("HDFS_CLIENT");
serviceComponents.put("HDFS", hdfsComponents);
-Collection yarnComponents = new HashSet();
+Collection yarnComponents = new HashSet<>();
yarnComponents.add("RESOURCEMANAGER");
yarnComponents.add("NODEMANAGER");
yarnComponents.add("YARN_CLIENT");
yarnComponents.add("APP_TIMELINE_SERVER");
serviceComponents.put("YARN", yarnComponents);
-Collection mrComponents = new HashSet();
+Collection mrComponents = new HashSet<>();
mrComponents.add("MAPREDUCE2_CLIENT");
mrComponents.add("HISTORY_SERVER");
serviceComponents.put("MAPREDUCE2", mrComponents);
-Collection zkComponents = new HashSet();
+Collection zkComponents = new HashSet<>();
zkComponents.add("ZOOKEEPER_SERVER");
zkComponents.add("ZOOKEEPER_CLIENT");
serviceComponents.put("ZOOKEEPER", zkComponents);
-Collection hiveComponents = new HashSet();
+Collection hiveComponents = new HashSet<>();
hiveComponents.add("MYSQL_SERVER");
hiveComponents.add("HIVE_METASTORE");
hiveComponents.add("HIVE_SERVER");
serviceComponents.put("HIVE", hiveComponents);
-Collection falconComponents = new HashSet();
+Collection falconComponents = new HashSet<>();
falconComponents.add("FALCON_SERVER");
falconComponents.add("FALCON_CLIENT");
serviceComponents.put("FALCON", falconComponents);
-Collection gangliaComponents = new HashSet();
+Collection gangliaComponents = new HashSet<>();
gangliaComponents.add("GANGLIA_SERVER");
gangliaComponents.add("GANGLIA_CLIENT");
serviceComponents.put("GANGLIA", gangliaComponents);
-Collection kafkaComponents = new HashSet();
+Collection kafkaComponents = new HashSet<>();
kafkaComponents.add("KAFKA_BROKER");
serviceComponents.put("KAFKA", kafkaComponents);
-Collection knoxComponents = new HashSet();
+Collection knoxComponents = new HashSet<>();
knoxComponents.add("KNOX_GATEWAY");
serviceComponents.put("KNOX", knoxComponents);
-Collection oozieComponents = new HashSet();
+Collection oozieComponents = new HashSet<>();
oozieComponents.add("OOZIE_SERVER");
oozieComponents.add("OOZIE_CLIENT");
serviceComponents.put("OOZIE", oozieComponents);
-Collection hbaseComponents = new HashSet();
+Collection hbaseComponents = new HashSet<>();
hbaseComponents.add("HBASE_MASTER");
serviceComponents.put("HBASE", hbaseComponents);
-Collection atlasComponents = new HashSet();
+Collection atlasComponents = new HashSet<>();
atlasComponents.add("ATLAS_SERVER");
atlasComponents.add("ATLAS_CLIENT");
serviceComponents.put("ATLAS", atlasComponents);
-Collection amsComponents = new HashSet();
+Collection amsComponents = new HashSet<>();
amsComponents.add("METRICS_COLLECTOR");
serviceComponents.put("AMBARI_METRICS", amsComponents);
-Collection stormComponents = new HashSet();
+Collection stormComponents = new HashSet<>();
stormComponents.add("NIMBUS");
serviceComponents.put("STORM", stormComponents);
@@ -202,26 +202,26 @@ public class BlueprintConfigurationProcessorTest {
@Test
public void testDoUpdateForBlueprintExport_SingleHostProperty() throws
Exception {
-Map> properties = new HashMap>();
-Map typeProps = new HashMap()
[27/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProvider.java
index 1dc21b0..6d32868 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProvider.java
@@ -65,8 +65,8 @@ public class AlertNoticeResourceProvider extends
AbstractControllerResourceProvi
public static final String ALERT_NOTICE_HISTORY_ID =
"AlertNotice/history_id";
public static final String ALERT_NOTICE_CLUSTER_NAME =
"AlertNotice/cluster_name";
- private static final Set PK_PROPERTY_IDS = new HashSet(
- Arrays.asList(ALERT_NOTICE_ID));
+ private static final Set PK_PROPERTY_IDS = new HashSet<>(
+Arrays.asList(ALERT_NOTICE_ID));
/**
* Used for querying alert history.
@@ -77,13 +77,13 @@ public class AlertNoticeResourceProvider extends
AbstractControllerResourceProvi
/**
* The property ids for an alert history resource.
*/
- private static final Set PROPERTY_IDS = new HashSet();
+ private static final Set PROPERTY_IDS = new HashSet<>();
/**
* The key property ids for an alert history resource.
*/
private static final Map KEY_PROPERTY_IDS =
- new HashMap();
+new HashMap<>();
static {
// properties
@@ -175,7 +175,7 @@ public class AlertNoticeResourceProvider extends
AbstractControllerResourceProvi
}
Set requestPropertyIds = getRequestPropertyIds(request, predicate);
-Set results = new LinkedHashSet();
+Set results = new LinkedHashSet<>();
AlertNoticeRequest noticeRequest = new AlertNoticeRequest();
noticeRequest.Predicate = predicate;
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
index 4cf41b4..31a1000 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
@@ -84,8 +84,8 @@ public class AlertResourceProvider extends
ReadOnlyResourceProvider implements
protected static final String ALERT_REPEAT_TOLERANCE_REMAINING =
"Alert/repeat_tolerance_remaining";
protected static final String ALERT_FIRMNESS = "Alert/firmness";
- private static Set pkPropertyIds = new HashSet(
- Arrays.asList(ALERT_ID, ALERT_DEFINITION_NAME));
+ private static Set pkPropertyIds = new HashSet<>(
+Arrays.asList(ALERT_ID, ALERT_DEFINITION_NAME));
@Inject
private static AlertsDAO alertsDAO;
@@ -99,12 +99,12 @@ public class AlertResourceProvider extends
ReadOnlyResourceProvider implements
/**
* The property ids for an alert defintion resource.
*/
- private static final Set PROPERTY_IDS = new HashSet();
+ private static final Set PROPERTY_IDS = new HashSet<>();
/**
* The key property ids for an alert definition resource.
*/
- private static final Map KEY_PROPERTY_IDS = new
HashMap();
+ private static final Map KEY_PROPERTY_IDS = new
HashMap<>();
static {
// properties
@@ -170,7 +170,7 @@ public class AlertResourceProvider extends
ReadOnlyResourceProvider implements
Set requestPropertyIds = getRequestPropertyIds(request, predicate);
// use a collection which preserves order since JPA sorts the results
-Set results = new LinkedHashSet();
+Set results = new LinkedHashSet<>();
for (Map propertyMap : getPropertyMaps(predicate)) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertSummaryPropertyProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertSummaryPropertyProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertSummaryPropertyProvider.java
index 5c6bc85..6227f39 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertSummaryPropertyProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertSummaryPropertyProvider.java
@@ -80,7 +80,
[24/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
index e997cb3..63d6994 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
@@ -111,18 +111,18 @@ public class StackArtifactResourceProvider extends
AbstractControllerResourcePro
/**
* primary key fields
*/
- public static Set pkPropertyIds = new HashSet();
+ public static Set pkPropertyIds = new HashSet<>();
/**
* map of resource type to fk field
*/
public static Map keyPropertyIds =
- new HashMap();
+new HashMap<>();
/**
* resource properties
*/
- public static Set propertyIds = new HashSet();
+ public static Set propertyIds = new HashSet<>();
/**
* name of the kerberos descriptor artifact.
@@ -191,7 +191,7 @@ public class StackArtifactResourceProvider extends
AbstractControllerResourcePro
NoSuchResourceException,
NoSuchParentResourceException {
-Set resources = new HashSet();
+Set resources = new HashSet<>();
resources.addAll(getKerberosDescriptors(request, predicate));
resources.addAll(getMetricsDescriptors(request, predicate));
@@ -260,7 +260,7 @@ public class StackArtifactResourceProvider extends
AbstractControllerResourcePro
NoSuchParentResourceException,
NoSuchResourceException {
-Set resources = new HashSet();
+Set resources = new HashSet<>();
for (Map properties : getPropertyMaps(predicate)) {
String artifactName = (String) properties.get(ARTIFACT_NAME_PROPERTY_ID);
@@ -312,7 +312,7 @@ public class StackArtifactResourceProvider extends
AbstractControllerResourcePro
throws SystemException, UnsupportedPropertyException,
NoSuchParentResourceException, NoSuchResourceException {
-Set resources = new HashSet();
+Set resources = new HashSet<>();
for (Map properties : getPropertyMaps(predicate)) {
String artifactName = (String) properties.get(ARTIFACT_NAME_PROPERTY_ID);
@@ -348,7 +348,7 @@ public class StackArtifactResourceProvider extends
AbstractControllerResourcePro
Map> hostMetrics =
PropertyHelper.getMetricPropertyIds(Resource.Type.Host);
-descriptor = new HashMap();
+descriptor = new HashMap<>();
descriptor.put(Resource.Type.Cluster.name(), clusterMetrics);
descriptor.put(Resource.Type.Host.name(), hostMetrics);
}
@@ -379,7 +379,7 @@ public class StackArtifactResourceProvider extends
AbstractControllerResourcePro
throws SystemException, UnsupportedPropertyException,
NoSuchParentResourceException, NoSuchResourceException {
-Set resources = new HashSet();
+Set resources = new HashSet<>();
for (Map properties : getPropertyMaps(predicate)) {
String artifactName = (String) properties.get(ARTIFACT_NAME_PROPERTY_ID);
@@ -581,7 +581,7 @@ public class StackArtifactResourceProvider extends
AbstractControllerResourcePro
* @throws IOException if unable to read or parse a descriptor file
*/
private Collection
getServiceDescriptors(StackInfo stack) throws IOException {
-Collection serviceDescriptors = new
ArrayList();
+Collection serviceDescriptors = new
ArrayList<>();
for (ServiceInfo service : stack.getServices()) {
File descriptorFile = service.getKerberosDescriptorFile();
if (descriptorFile != null) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProvider.java
index 0712bf7..093aea4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProvider.java
@@ -60,10 +60,10 @@ public class StackConfigurationDependencyResourceProvider
extends
public static final String DEPENDENCY_TYPE_PROPERTY_ID = PropertyHelper
.getPropertyId("Stac
[14/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
index 334b3b3..3eaf890 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesTezDistributedCacheCheckTest.java
@@ -95,13 +95,13 @@ public class ServicesTezDistributedCacheCheckTest {
final DesiredConfig desiredConfig = Mockito.mock(DesiredConfig.class);
Mockito.when(desiredConfig.getTag()).thenReturn("tag");
-Map configMap = new HashMap();
+Map configMap = new HashMap<>();
configMap.put("tez-site", desiredConfig);
configMap.put("core-site", desiredConfig);
Mockito.when(cluster.getDesiredConfigs()).thenReturn(configMap);
final Config config = Mockito.mock(Config.class);
Mockito.when(cluster.getConfig(Mockito.anyString(),
Mockito.anyString())).thenReturn(config);
-final Map properties = new HashMap();
+final Map properties = new HashMap<>();
Mockito.when(config.getProperties()).thenReturn(properties);
PrerequisiteCheck check = new PrerequisiteCheck(null, null);
@@ -169,16 +169,16 @@ public class ServicesTezDistributedCacheCheckTest {
final DesiredConfig desiredConfig = Mockito.mock(DesiredConfig.class);
Mockito.when(desiredConfig.getTag()).thenReturn("tag");
-Map configMap = new HashMap();
+Map configMap = new HashMap<>();
configMap.put("tez-site", desiredConfig);
configMap.put("core-site", desiredConfig);
Mockito.when(cluster.getDesiredConfigs()).thenReturn(configMap);
final Config config = Mockito.mock(Config.class);
Mockito.when(cluster.getConfig(Mockito.anyString(),
Mockito.anyString())).thenReturn(config);
-final Map properties = new HashMap();
+final Map properties = new HashMap<>();
Mockito.when(config.getProperties()).thenReturn(properties);
-Map checkProperties = new HashMap();
+Map checkProperties = new HashMap<>();
checkProperties.put("dfs-protocols-regex","^([^:]*dfs|wasb|ecs):.*");
PrerequisiteCheckConfig prerequisiteCheckConfig =
Mockito.mock(PrerequisiteCheckConfig.class);
Mockito.when(prerequisiteCheckConfig.getCheckProperties(
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
index 65505fa..1368b8d 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
@@ -116,7 +116,7 @@ public class ServicesUpCheckTest {
final Service tezService = Mockito.mock(Service.class);
final Service amsService = Mockito.mock(Service.class);
-HashMap clusterServices = new HashMap();
+HashMap clusterServices = new HashMap<>();
clusterServices.put("HDFS", hdfsService);
clusterServices.put("TEZ", tezService);
clusterServices.put("AMBARI_METRICS", amsService);
@@ -148,7 +148,7 @@ public class ServicesUpCheckTest {
// Put Components inside Services
// HDFS
-Map hdfsComponents = new HashMap();
+Map hdfsComponents = new HashMap<>();
ServiceComponent nameNode = Mockito.mock(ServiceComponent.class);
Mockito.when(nameNode.getName()).thenReturn("NAMENODE");
@@ -175,7 +175,7 @@ public class ServicesUpCheckTest {
Mockito.when(hdfsService.getServiceComponents()).thenReturn(hdfsComponents);
// TEZ
-Map tezComponents = new HashMap();
+Map tezComponents = new HashMap<>();
ServiceComponent tezClient = Mockito.mock(ServiceComponent.class);
Mockito.when(tezClient.getName()).thenReturn("TEZ_CLIENT");
@@ -187,7 +187,7 @@ public class ServicesUpCheckTest {
Mockito.when(tezService.getServiceComponents()).thenReturn(tezComponents);
// AMS
-Map amsComponents = new HashMap();
+Map amsComponents = new HashMap<>();
ServiceComponent metricsCollector = Mockito.mock(ServiceComponent.class);
Mockito.when(metricsCollector.getName()).thenReturn("METRICS_COLLECTOR");
@@ -223,7 +223,7 @@ public class ServicesUpCheckTest {
Mockito.when(hcsMetricsCollector.getHostId()).thenReturn(Long.valueOf(1));
Mockito.when(hcsMetricsMonitor.getHostId()).thenReturn(Long.valueOf(1));
-List allHostComponentSummaries
[02/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigurationTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigurationTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigurationTest.java
index 6a52762..b4aac40 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigurationTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigurationTest.java
@@ -34,16 +34,16 @@ import org.junit.Test;
*/
public class ConfigurationTest {
- private static final Map> EMPTY_PROPERTIES = new
HashMap>();
- private static final Map>>
EMPTY_ATTRIBUTES = new HashMap>>();
+ private static final Map> EMPTY_PROPERTIES = new
HashMap<>();
+ private static final Map>>
EMPTY_ATTRIBUTES = new HashMap<>();
@Test
public void testGetProperties_noParent() {
-Map> properties = new HashMap>();
-Map typeProperties1 = new HashMap();
+Map> properties = new HashMap<>();
+Map typeProperties1 = new HashMap<>();
typeProperties1.put("prop1", "val1");
typeProperties1.put("prop2", "val2");
-Map typeProperties2 = new HashMap();
+Map typeProperties2 = new HashMap<>();
typeProperties2.put("prop1", "val1");
typeProperties2.put("prop3", "val3");
@@ -57,11 +57,11 @@ public class ConfigurationTest {
@Test
public void testGetFullProperties_noParent() {
-Map> properties = new HashMap>();
-Map typeProperties1 = new HashMap();
+Map> properties = new HashMap<>();
+Map typeProperties1 = new HashMap<>();
typeProperties1.put("prop1", "val1");
typeProperties1.put("prop2", "val2");
-Map typeProperties2 = new HashMap();
+Map typeProperties2 = new HashMap<>();
typeProperties2.put("prop1", "val1");
typeProperties2.put("prop3", "val3");
@@ -75,21 +75,21 @@ public class ConfigurationTest {
@Test
public void testGetProperties_withParent() {
-Map> properties = new HashMap>();
-Map typeProperties1 = new HashMap();
+Map> properties = new HashMap<>();
+Map typeProperties1 = new HashMap<>();
typeProperties1.put("prop1", "val1");
typeProperties1.put("prop2", "val2");
-Map typeProperties2 = new HashMap();
+Map typeProperties2 = new HashMap<>();
typeProperties2.put("prop1", "val1");
typeProperties2.put("prop3", "val3");
properties.put("type1", typeProperties1);
properties.put("type2", typeProperties2);
-Map> parentProperties = new HashMap>();
-Map parentTypeProperties1 = new HashMap();
+Map> parentProperties = new HashMap<>();
+Map parentTypeProperties1 = new HashMap<>();
parentTypeProperties1.put("prop5", "val5");
-Map parentTypeProperties3 = new HashMap();
+Map parentTypeProperties3 = new HashMap<>();
parentTypeProperties3.put("prop6", "val6");
parentProperties.put("type1", parentTypeProperties1);
@@ -195,12 +195,12 @@ public class ConfigurationTest {
@Test
public void testGetAttributes_noParent() {
-Map>> attributes = new
HashMap>>();
-Map> attributeProperties = new HashMap>();
-Map properties1 = new HashMap();
+Map>> attributes = new HashMap<>();
+Map> attributeProperties = new HashMap<>();
+Map properties1 = new HashMap<>();
properties1.put("prop1", "val1");
properties1.put("prop2", "val2");
-Map properties2 = new HashMap();
+Map properties2 = new HashMap<>();
properties2.put("prop1", "val3");
attributeProperties.put("attribute1", properties1);
attributeProperties.put("attribute2", properties2);
@@ -362,12 +362,12 @@ public class ConfigurationTest {
private Configuration createConfigurationWithParents_PropsOnly() {
// parents parent config properties
-Map> parentParentProperties = new
HashMap>();
-Map parentParentTypeProperties1 = new HashMap();
+Map> parentParentProperties = new HashMap<>();
+Map parentParentTypeProperties1 = new HashMap<>();
parentParentTypeProperties1.put("prop1", "val1.1");
parentParentTypeProperties1.put("prop2", "val2.1");
parentParentTypeProperties1.put("prop3", "val3.1");
-Map parentParentTypeProperties2 = new HashMap();
+Map parentParentTypeProperties2 = new HashMap<>();
parentParentTypeProperties2.put("prop4", "val4.1");
parentParentTypeProperties2.put("prop5", "val5.1");
@@ -376,12 +376,12 @@ public class ConfigurationTest {
Configuration parentParentConfiguration = new
Configuration(parentParentProperties, EMPTY_ATTRIBUTES);
// parent config properties
-Map> parentProperties = new HashMap>();
-Map parentTypeProperties1 = new HashMap();
// override
+Map> parentProperties = new HashMap<>();
+Map parentTypeProperties1 = new HashMap<>(); // override
parentTypeProperties1.put("prop1", "val1.2"); // overr
[28/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 5204322..6687942 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
@@ -297,8 +297,8 @@ public class KerberosHelperImpl implements KerberosHelper {
public void configureServices(Cluster cluster, Map> serviceFilter)
throws AmbariException, KerberosInvalidConfigurationException {
Map> existingConfigurations =
calculateExistingConfigurations(cluster, null);
-Map> installedServices = new HashMap>();
-Set previouslyExistingServices = new HashSet();
+Map> installedServices = new HashMap<>();
+Set previouslyExistingServices = new HashSet<>();
// Calculate the map of installed services to installed components
Map clusterServices = cluster.getServices();
@@ -306,7 +306,7 @@ public class KerberosHelperImpl implements KerberosHelper {
for (Service clusterService : clusterServices.values()) {
Set installedComponents =
installedServices.get(clusterService.getName());
if (installedComponents == null) {
- installedComponents = new HashSet();
+ installedComponents = new HashSet<>();
installedServices.put(clusterService.getName(), installedComponents);
}
@@ -351,7 +351,7 @@ public class KerberosHelperImpl implements KerberosHelper {
boolean applyStackAdvisorUpdates)
throws KerberosInvalidConfigurationException, AmbariException {
-Map> kerberosConfigurations = new
HashMap>();
+Map> kerberosConfigurations = new HashMap<>();
KerberosDetails kerberosDetails = getKerberosDetails(cluster, null);
KerberosDescriptor kerberosDescriptor = getKerberosDescriptor(cluster);
@@ -359,17 +359,17 @@ public class KerberosHelperImpl implements KerberosHelper
{
Map> configurations =
addAdditionalConfigurations(cluster,
deepCopy(existingConfigurations), null, kerberosDescriptorProperties);
-Map> propertiesToIgnore = new HashMap>();
+Map> propertiesToIgnore = new HashMap<>();
// If Ambari is managing it own identities then add AMBARI to the set of
installed servcie so
// that its Kerberos descriptor entries will be included.
if (createAmbariIdentities(existingConfigurations.get("kerberos-env"))) {
- installedServices = new HashMap>(installedServices);
+ installedServices = new HashMap<>(installedServices);
installedServices.put("AMBARI", Collections.singleton("AMBARI_SERVER"));
}
// Create the context to use for filtering Kerberos Identities based on
the state of the cluster
-Map filterContext = new HashMap();
+Map filterContext = new HashMap<>();
filterContext.put("configurations", configurations);
filterContext.put("services", installedServices.keySet());
@@ -428,7 +428,7 @@ public class KerberosHelperImpl implements KerberosHelper {
StackId stackVersion = cluster.getCurrentStackVersion();
-List hostNames = new ArrayList();
+List hostNames = new ArrayList<>();
Collection hosts = cluster.getHosts();
if (hosts != null) {
@@ -442,10 +442,10 @@ public class KerberosHelperImpl implements KerberosHelper
{
// This could happen when enabling Kerberos while installing a cluster via
Blueprints due to the
// way hosts are discovered during the install process.
if (!hostNames.isEmpty()) {
- Map>> requestConfigurations =
new HashMap>>();
+ Map>> requestConfigurations =
new HashMap<>();
if (existingConfigurations != null) {
for (Map.Entry> configuration :
existingConfigurations.entrySet()) {
- Map> properties = new HashMap>();
+ Map> properties = new HashMap<>();
String configType = configuration.getKey();
Map configurationProperties =
configuration.getValue();
@@ -454,7 +454,7 @@ public class KerberosHelperImpl implements KerberosHelper {
}
if ("cluster-env".equals(configType)) {
-configurationProperties = new HashMap(configurationProperties);
+configurationProperties = new HashMap<>(configurationProperties);
configurationProperties.put("security_enabled", (kerberosEnabled)
? "true" : "false");
}
@@ -472,15 +472,15 @@ public class KerberosHelperImpl implements KerberosHelper
{
Map> requestConfiguration =
requestConfigurations.get(configType);
if (requestConfiguration == null) {
-
[07/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java
index c5ccc3c..0e9ac75 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java
@@ -159,7 +159,7 @@ public class SimplifyingPredicateVisitorTest {
verify(provider);
reset(provider);
expect(provider.checkPropertyIds(capture(propertiesCapture))).andReturn(Collections.emptySet());
-
expect(provider.checkPropertyIds(capture(propertiesCapture))).andReturn(Collections.singleton(PROPERTY_D));
+
expect(provider.checkPropertyIds(capture(propertiesCapture))).andReturn(Collections.singleton(PROPERTY_D));
replay(provider);
// ---
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java
index 0ac186d..6191295 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java
@@ -52,10 +52,10 @@ public class StackAdvisorResourceProviderTest {
keyPropertyIds, ambariManagementController);
Request request = mock(Request.class);
-Set> propertiesSet = new HashSet>();
-Map propertiesMap = new HashMap();
+Set> propertiesSet = new HashSet<>();
+Map propertiesMap = new HashMap<>();
propertiesMap.put(CONFIGURATIONS_PROPERTY_ID +
"site/properties/string_prop", "string");
-List array = new ArrayList();
+List array = new ArrayList<>();
array.add("array1");
array.add("array2");
propertiesMap.put(CONFIGURATIONS_PROPERTY_ID +
"site/properties/array_prop", array);
@@ -87,10 +87,10 @@ public class StackAdvisorResourceProviderTest {
keyPropertyIds, ambariManagementController);
Request request = mock(Request.class);
-Set> propertiesSet = new HashSet>();
-Map propertiesMap = new HashMap();
+Set> propertiesSet = new HashSet<>();
+Map propertiesMap = new HashMap<>();
propertiesMap.put(CONFIGURATIONS_PROPERTY_ID +
"site/properties/string_prop", "string");
-List array = new ArrayList();
+List array = new ArrayList<>();
array.add("array1");
array.add("array2");
propertiesMap.put(USER_CONTEXT_OPERATION_PROPERTY, "op1");
@@ -117,10 +117,10 @@ public class StackAdvisorResourceProviderTest {
keyPropertyIds, ambariManagementController);
Request request = mock(Request.class);
-Set> propertiesSet = new HashSet>();
-Map propertiesMap = new HashMap();
+Set> propertiesSet = new HashSet<>();
+Map propertiesMap = new HashMap<>();
propertiesMap.put(CONFIGURATIONS_PROPERTY_ID +
"site/properties/string_prop", null); //null value means no value specified for
the property
-List array = new ArrayList();
+List array = new ArrayList<>();
array.add("array1");
array.add("array2");
propertiesMap.put(CONFIGURATIONS_PROPERTY_ID +
"site/properties/array_prop", array);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
index 149a91c..880f7ec 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java
@@ -97,7 +97,7 @@ public class StackArtifactResourceProviderTest {
StackArtifactResourceProvider resourceProvider =
getStackArtifactResourceProvider(managementController);
-Set propertyIds = new HashSet();
+Set propertyId
[15/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
index d1f9c90..07c3a90 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
@@ -120,18 +120,18 @@ public class PersistenceManagerImplTest {
Request serverRequest = createStrictMock(Request.class);
RequestBody body = new RequestBody();
-Map mapResourceIds = new HashMap();
+Map mapResourceIds = new HashMap<>();
mapResourceIds.put(Resource.Type.Cluster, "clusterId");
mapResourceIds.put(Resource.Type.Service, "serviceId");
-Map mapProperties = new HashMap();
+Map mapProperties = new HashMap<>();
mapProperties.put("componentId", "id");
mapProperties.put(PropertyHelper.getPropertyId("foo", "bar"), "value");
NamedPropertySet namedPropSet = new NamedPropertySet("", mapProperties);
body.addPropertySet(namedPropSet);
-Set> setExpected = new HashSet>();
-Map mapExpected = new HashMap(mapProperties);
+Set> setExpected = new HashSet<>();
+Map mapExpected = new HashMap<>(mapProperties);
mapExpected.put(clusterId, "clusterId");
mapExpected.put(serviceId, "serviceId");
setExpected.add(mapExpected);
@@ -164,13 +164,13 @@ public class PersistenceManagerImplTest {
Request serverRequest = createStrictMock(Request.class);
RequestBody body = new RequestBody();
-Map mapResourceIds = new HashMap();
+Map mapResourceIds = new HashMap<>();
mapResourceIds.put(Resource.Type.Cluster, "clusterId");
mapResourceIds.put(Resource.Type.Service, "serviceId");
mapResourceIds.put(Resource.Type.Component, "componentId");
-Set> setExpected = new HashSet>();
-Map mapExpected = new HashMap();
+Set> setExpected = new HashSet<>();
+Map mapExpected = new HashMap<>();
mapExpected.put(clusterId, "clusterId");
mapExpected.put(serviceId, "serviceId");
mapExpected.put(componentId, "componentId");
@@ -204,15 +204,15 @@ public class PersistenceManagerImplTest {
String clusterId = "clusterId";
String serviceId = "serviceId";
-Map mapResourceIds = new HashMap();
+Map mapResourceIds = new HashMap<>();
mapResourceIds.put(Resource.Type.Cluster, "clusterId");
mapResourceIds.put(Resource.Type.Service, "serviceId");
-Map mapResourceProps1 = new HashMap();
+Map mapResourceProps1 = new HashMap<>();
mapResourceProps1.put("componentId", "id1");
mapResourceProps1.put(PropertyHelper.getPropertyId("foo", "bar"), "value");
-Map mapResourceProps2 = new HashMap();
+Map mapResourceProps2 = new HashMap<>();
mapResourceProps1.put("componentId", "id2");
mapResourceProps2.put(PropertyHelper.getPropertyId("foo", "bar2"),
"value2");
@@ -222,12 +222,12 @@ public class PersistenceManagerImplTest {
body.addPropertySet(namedPropSet1);
body.addPropertySet(namedPropSet2);
-Set> setExpected = new HashSet>();
-Map mapExpected1 = new HashMap(mapResourceProps1);
+Set> setExpected = new HashSet<>();
+Map mapExpected1 = new HashMap<>(mapResourceProps1);
mapExpected1.put(clusterId, "clusterId");
mapExpected1.put(serviceId, "serviceId");
setExpected.add(mapExpected1);
-Map mapExpected2 = new HashMap(mapResourceProps2);
+Map mapExpected2 = new HashMap<>(mapResourceProps2);
mapExpected2.put(clusterId, "clusterId");
mapExpected2.put(serviceId, "serviceId");
setExpected.add(mapExpected2);
@@ -264,16 +264,16 @@ public class PersistenceManagerImplTest {
// because the value is not set in the request
String serviceId = null;
-Map mapResourceIds = new HashMap();
+Map mapResourceIds = new HashMap<>();
mapResourceIds.put(Resource.Type.Cluster, clusterId);
mapResourceIds.put(Resource.Type.Service, serviceId);
-Map mapProperties = new HashMap();
+Map mapProperties = new HashMap<>();
mapProperties.put(PropertyHelper.getPropertyId("foo", "bar"), "value");
NamedPropertySet namedPropSet = new NamedPropertySet("", mapProperties);
body.addPropertySet(namedPropSet);
-Set> setExpected = new HashSet>();
+Set> setExpected = new HashSet<>();
setExpected.add(mapProperties);
//expectations
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java
--
diff --git
a/ambari-server/src/test/java
[09/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
index 9e60dad..f890e17 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
@@ -222,7 +222,7 @@ public class ClusterStackVersionResourceProviderTest {
repoVersion.setId(1l);
repoVersion.setOperatingSystems(OS_JSON);
-Map hostsForCluster = new HashMap();
+Map hostsForCluster = new HashMap<>();
int hostCount = 10;
for (int i = 0; i < hostCount; i++) {
String hostname = "host" + i;
@@ -271,7 +271,7 @@ public class ClusterStackVersionResourceProviderTest {
AbstractControllerResourceProvider.init(resourceProviderFactory);
-Map> hostConfigTags = new HashMap>();
+Map> hostConfigTags = new HashMap<>();
expect(configHelper.getEffectiveDesiredTags(anyObject(ClusterImpl.class),
anyObject(String.class))).andReturn(hostConfigTags);
expect(managementController.getClusters()).andReturn(clusters).anyTimes();
@@ -363,9 +363,9 @@ public class ClusterStackVersionResourceProviderTest {
injector.injectMembers(provider);
// add the property map to a set for the request. add more maps for
multiple creates
-Set> propertySet = new LinkedHashSet>();
+Set> propertySet = new LinkedHashSet<>();
-Map properties = new LinkedHashMap();
+Map properties = new LinkedHashMap<>();
// add properties to the request map
properties.put(ClusterStackVersionResourceProvider.CLUSTER_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID,
"Cluster100");
@@ -413,7 +413,7 @@ public class ClusterStackVersionResourceProviderTest {
ambariMetaInfo.getComponent("HDP", "2.1.1", "HBASE",
"HBASE_MASTER").setVersionAdvertised(true);
-Map hostsForCluster = new HashMap();
+Map hostsForCluster = new HashMap<>();
int hostCount = 10;
for (int i = 0; i < hostCount; i++) {
String hostname = "host" + i;
@@ -491,7 +491,7 @@ public class ClusterStackVersionResourceProviderTest {
AbstractControllerResourceProvider.init(resourceProviderFactory);
-Map> hostConfigTags = new HashMap>();
+Map> hostConfigTags = new HashMap<>();
expect(configHelper.getEffectiveDesiredTags(anyObject(ClusterImpl.class),
anyObject(String.class))).andReturn(hostConfigTags);
expect(managementController.getClusters()).andReturn(clusters).anyTimes();
@@ -585,9 +585,9 @@ public class ClusterStackVersionResourceProviderTest {
injector.injectMembers(provider);
// add the property map to a set for the request. add more maps for
multiple creates
-Set> propertySet = new LinkedHashSet>();
+Set> propertySet = new LinkedHashSet<>();
-Map properties = new LinkedHashMap();
+Map properties = new LinkedHashMap<>();
// add properties to the request map
properties.put(ClusterStackVersionResourceProvider.CLUSTER_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID,
"Cluster100");
@@ -646,7 +646,7 @@ public class ClusterStackVersionResourceProviderTest {
ambariMetaInfo.getComponent("HDP", "2.1.1", "HBASE",
"HBASE_MASTER").setVersionAdvertised(true);
-Map hostsForCluster = new HashMap();
+Map hostsForCluster = new HashMap<>();
int hostCount = 10;
for (int i = 0; i < hostCount; i++) {
String hostname = "host" + i;
@@ -708,7 +708,7 @@ public class ClusterStackVersionResourceProviderTest {
AbstractControllerResourceProvider.init(resourceProviderFactory);
-Map> hostConfigTags = new HashMap>();
+Map> hostConfigTags = new HashMap<>();
expect(configHelper.getEffectiveDesiredTags(anyObject(ClusterImpl.class),
anyObject(String.class))).andReturn(hostConfigTags);
expect(managementController.getClusters()).andReturn(clusters).anyTimes();
@@ -807,9 +807,9 @@ public class ClusterStackVersionResourceProviderTest {
injector.injectMembers(provider);
// add the property map to a set for the request. add more maps for
multiple creates
-Set> propertySet = new LinkedHashSet>();
+Set> propertySet = new LinkedHashSet<>();
-Map properties = new LinkedHashMap();
+Map properties = new LinkedHashMap<>();
// add properties to the request map
properties.put(ClusterStackVersionResourceProvider.CLUSTER_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID,
"Cluster100");
@@ -878,7 +878,7 @@ public class ClusterStackVersionResourceProviderTest {
ambariMetaInfo.getCom
[31/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
index 0042f53..a77ed75 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
@@ -210,7 +210,7 @@ public class HeartbeatMonitor implements Runnable {
* @return list of commands to get status of service components on a
concrete host
*/
public List generateStatusCommands(String hostname) throws
AmbariException {
-List cmds = new ArrayList();
+List cmds = new ArrayList<>();
for (Cluster cl : clusters.getClustersForHost(hostname)) {
Map desiredConfigs = cl.getDesiredConfigs();
@@ -249,8 +249,8 @@ public class HeartbeatMonitor implements Runnable {
StackInfo stackInfo = ambariMetaInfo.getStack(stackId.getStackName(),
stackId.getStackVersion());
-Map> configurations = new TreeMap>();
-Map>> configurationAttributes =
new TreeMap>>();
+Map> configurations = new TreeMap<>();
+Map>> configurationAttributes =
new TreeMap<>();
// get the cluster config for type '*-env'
// apply config group overrides
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
index 4fbc161..8cd2804 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
@@ -357,7 +357,7 @@ public class HeartbeatProcessor extends AbstractService{
List reports = heartbeat.getReports();
// Cache HostRoleCommand entities because we will need them few times
-List taskIds = new ArrayList();
+List taskIds = new ArrayList<>();
for (CommandReport report : reports) {
taskIds.add(report.getTaskId());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
index 988e78b..d1e5dbc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
@@ -45,7 +45,7 @@ public class HostInfo {
private String macaddress;
private long memoryfree;
private long memorysize;
- private List mounts = new ArrayList();
+ private List mounts = new ArrayList<>();
private long memorytotal;
private String netmask;
private String operatingsystem;
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java
index 40b2260..47af7c1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java
@@ -30,7 +30,7 @@ public class RecoveryReport {
* One of DISABLED, RECOVERABLE, UNRECOVERABLE, PARTIALLY_RECOVERABLE
*/
private String summary = "DISABLED";
- private List componentReports = new
ArrayList();
+ private List componentReports = new ArrayList<>();
@JsonProperty("summary")
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
index c12ed82..8efefde 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
@@ -38,7 +38,7 @@ public class RegistrationResponse {
* alert definitions it needs to schedule.
*/
@JsonProperty("alertDefinitionComman
[21/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareDisableKerberosServerAction.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareDisableKerberosServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareDisableKerberosServerAction.java
index e0d16af..5b65833 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareDisableKerberosServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareDisableKerberosServerAction.java
@@ -91,7 +91,7 @@ public class PrepareDisableKerberosServerAction extends
AbstractPrepareKerberosS
}
});
-Map> kerberosConfigurations = new
HashMap>();
+Map> kerberosConfigurations = new HashMap<>();
Map commandParameters = getCommandParameters();
String dataDirectory = getCommandParameterValue(commandParameters,
DATA_DIRECTORY);
@@ -143,7 +143,7 @@ public class PrepareDisableKerberosServerAction extends
AbstractPrepareKerberosS
// Ensure the cluster-env/security_enabled flag is set properly
Map clusterEnvProperties =
kerberosConfigurations.get(KerberosHelper.SECURITY_ENABLED_CONFIG_TYPE);
if (clusterEnvProperties == null) {
- clusterEnvProperties = new HashMap();
+ clusterEnvProperties = new HashMap<>();
kerberosConfigurations.put(KerberosHelper.SECURITY_ENABLED_CONFIG_TYPE,
clusterEnvProperties);
}
clusterEnvProperties.put(KerberosHelper.SECURITY_ENABLED_PROPERTY_NAME,
"false");
@@ -157,13 +157,13 @@ public class PrepareDisableKerberosServerAction extends
AbstractPrepareKerberosS
throw new AmbariException(message);
}
- Map> configurationsToRemove = new HashMap>();
+ Map> configurationsToRemove = new HashMap<>();
// Fill the configurationsToRemove map with all Kerberos-related
configurations. Values
// needed to be kept will have new values from the stack definition and
thus pruned from
// this map.
for (Map.Entry> entry :
kerberosConfigurations.entrySet()) {
-configurationsToRemove.put(entry.getKey(), new
HashSet(entry.getValue().keySet()));
+configurationsToRemove.put(entry.getKey(), new
HashSet<>(entry.getValue().keySet()));
}
// Remove cluster-env from the set of configurations to remove since it
has no default set
@@ -171,7 +171,7 @@ public class PrepareDisableKerberosServerAction extends
AbstractPrepareKerberosS
configurationsToRemove.remove("cluster-env");
if (!schToProcess.isEmpty()) {
-Set visitedServices = new HashSet();
+Set visitedServices = new HashSet<>();
for (ServiceComponentHost sch : schToProcess) {
String serviceName = sch.getServiceName();
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareEnableKerberosServerAction.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareEnableKerberosServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareEnableKerberosServerAction.java
index ed01633..ca15695 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareEnableKerberosServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareEnableKerberosServerAction.java
@@ -68,7 +68,7 @@ public class PrepareEnableKerberosServerAction extends
PrepareKerberosIdentities
Map commandParameters = getCommandParameters();
String dataDirectory = getCommandParameterValue(commandParameters,
DATA_DIRECTORY);
-Map> kerberosConfigurations = new
HashMap>();
+Map> kerberosConfigurations = new HashMap<>();
int schCount = schToProcess.size();
if (schCount == 0) {
@@ -100,7 +100,7 @@ public class PrepareEnableKerberosServerAction extends
PrepareKerberosIdentities
// Ensure the cluster-env/security_enabled flag is set properly
Map clusterEnvProperties =
kerberosConfigurations.get(KerberosHelper.SECURITY_ENABLED_CONFIG_TYPE);
if (clusterEnvProperties == null) {
- clusterEnvProperties = new HashMap();
+ clusterEnvProperties = new HashMap<>();
kerberosConfigurations.put(KerberosHelper.SECURITY_ENABLED_CONFIG_TYPE,
clusterEnvProperties);
}
clusterEnvProperties.put(KerberosHelper.SECURITY_ENABLED_PROPERTY_NAME,
"true");
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/PrepareKerberosIdentitiesServerAction.java
[23/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
index 35adbcb..9737aaa 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
@@ -79,9 +79,9 @@ public class WorkflowResourceProvider extends
protected static final String WORKFLOW_CONTEXT_PROPERTY_ID = PropertyHelper
.getPropertyId("Workflow", "context");
- private static final Set pkPropertyIds = new HashSet(
- Arrays.asList(new String[] {WORKFLOW_CLUSTER_NAME_PROPERTY_ID,
- WORKFLOW_ID_PROPERTY_ID}));
+ private static final Set pkPropertyIds = new HashSet<>(
+Arrays.asList(new String[]{WORKFLOW_CLUSTER_NAME_PROPERTY_ID,
+ WORKFLOW_ID_PROPERTY_ID}));
protected WorkflowFetcher workflowFetcher;
@@ -128,7 +128,7 @@ public class WorkflowResourceProvider extends
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
-Set resourceSet = new HashSet();
+Set resourceSet = new HashSet<>();
Set requestedIds = getRequestPropertyIds(request, predicate);
Set> predicatePropertieSet = getPropertyMaps(predicate);
@@ -164,7 +164,7 @@ public class WorkflowResourceProvider extends
@Override
public Map getKeyPropertyIds() {
-Map keyPropertyIds = new HashMap();
+Map keyPropertyIds = new HashMap<>();
keyPropertyIds.put(Type.Cluster, WORKFLOW_CLUSTER_NAME_PROPERTY_ID);
keyPropertyIds.put(Type.Workflow, WORKFLOW_ID_PROPERTY_ID);
return keyPropertyIds;
@@ -246,7 +246,7 @@ public class WorkflowResourceProvider extends
@Override
public Set fetchWorkflows(Set requestedIds,
String clusterName, String workflowId) {
- Set workflows = new HashSet();
+ Set workflows = new HashSet<>();
ResultSet rs = null;
try {
rs = getResultSet(requestedIds, workflowId);
@@ -309,7 +309,7 @@ public class WorkflowResourceProvider extends
@Override
protected Map getDBFieldMap() {
-Map dbFields = new HashMap();
+Map dbFields = new HashMap<>();
dbFields.put(WORKFLOW_ID_PROPERTY_ID, WorkflowFields.WORKFLOWID);
dbFields.put(WORKFLOW_NAME_PROPERTY_ID, WorkflowFields.WORKFLOWNAME);
dbFields.put(WORKFLOW_USER_NAME_PROPERTY_ID, WorkflowFields.USERNAME);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
index 1df5bb4..8002087 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
@@ -68,7 +68,7 @@ public class JDBCResourceProvider extends BaseProvider
implements ResourceProvid
/**
* Key mappings used for joins.
*/
-private final Map> importedKeys = new
HashMap>();
+private final Map> importedKeys = new
HashMap<>();
protected final static Logger LOG =
LoggerFactory.getLogger(JDBCResourceProvider.class);
@@ -87,7 +87,7 @@ public class JDBCResourceProvider extends BaseProvider
implements ResourceProvid
public Set getResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
-Set resources = new HashSet();
+Set resources = new HashSet<>();
Set propertyIds = getRequestPropertyIds(request, predicate);
// Can't allow these properties with the old schema...
@@ -309,7 +309,7 @@ public class JDBCResourceProvider extends BaseProvider
implements ResourceProvid
private String getSelectSQL(Set propertyIds, Predicate predicate) {
StringBuilder columns = new StringBuilder();
-Set tableSet = new HashSet();
+Set tableSet = new HashSet<>();
for (String propertyId : propertyIds) {
if (columns.length() > 0) {
@@ -444,7 +444,7 @@ public class JDBCResourceProvider extends BaseProvider
implements ResourceProvid
private void getImportedKeys(Connection connection, String table) throws
SQLException {
if (!this.importedKeys.containsKey
[26/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 f2fd9ac..92e72ed 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
@@ -215,11 +215,11 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
@Override
public Set getResourcesAuthorized(Request request, Predicate
predicate) throws
SystemException, UnsupportedPropertyException, NoSuchResourceException,
NoSuchParentResourceException {
-final Set resources = new HashSet();
+final Set resources = new HashSet<>();
final Set requestedIds = getRequestPropertyIds(request, predicate);
final Set> propertyMaps = getPropertyMaps(predicate);
-List requestedEntities = new
ArrayList();
+List requestedEntities = new ArrayList<>();
for (Map propertyMap: propertyMaps) {
final String clusterName =
propertyMap.get(CLUSTER_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID).toString();
final Long id;
@@ -243,7 +243,7 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
for (ClusterVersionEntity entity: requestedEntities) {
final Resource resource = new
ResourceImpl(Resource.Type.ClusterStackVersion);
- final Map> hostStates = new HashMap>();
+ final Map> hostStates = new HashMap<>();
for (RepositoryVersionState state: RepositoryVersionState.values()) {
hostStates.put(state.name(), new ArrayList());
}
@@ -299,7 +299,7 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
Map propertyMap = iterator.next();
-Set requiredProperties = new HashSet();
+Set requiredProperties = new HashSet<>();
requiredProperties.add(CLUSTER_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID);
requiredProperties.add(CLUSTER_STACK_VERSION_REPOSITORY_VERSION_PROPERTY_ID);
requiredProperties.add(CLUSTER_STACK_VERSION_STACK_PROPERTY_ID);
@@ -490,7 +490,7 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
// build the list of OS repos
List operatingSystems =
repoVersionEnt.getOperatingSystems();
-Map> perOsRepos = new HashMap>();
+Map> perOsRepos = new HashMap<>();
for (OperatingSystemEntity operatingSystem : operatingSystems) {
if (operatingSystem.isAmbariManagedRepos()) {
@@ -503,7 +503,7 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
RequestStageContainer req = createRequest();
Iterator hostIterator = hosts.iterator();
-Map hostLevelParams = new HashMap();
+Map hostLevelParams = new HashMap<>();
hostLevelParams.put(JDK_LOCATION,
getManagementController().getJdkResourceUrl());
String hostParamsJson = StageUtils.getGson().toJson(hostLevelParams);
@@ -534,7 +534,7 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
boolean hasStage = false;
-ArrayList stages = new ArrayList(batchCount);
+ArrayList stages = new ArrayList<>(batchCount);
for (int batchId = 1; batchId <= batchCount; batchId++) {
// Create next stage
String stageName;
@@ -612,8 +612,8 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
// determine packages for all services that are installed on host
-List packages = new
ArrayList();
-Set servicesOnHost = new HashSet();
+List packages = new ArrayList<>();
+Set servicesOnHost = new HashSet<>();
List components =
cluster.getServiceComponentHosts(host.getHostName());
for (ServiceComponentHost component : components) {
if (repoServices.isEmpty() ||
repoServices.contains(component.getServiceName())) {
@@ -664,7 +664,7 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
final String packageList = gson.toJson(packages);
final String repoList = gson.toJson(repoInfo);
-Map params = new HashMap();
+Map params = new HashMap<>();
params.put("stack_id", stackId.getStackId());
params.put("repository_version", repoVersion.getVersion());
params.put("base_urls", repoList);
@@ -781,7 +781,7 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
}
Map propertyMap = iterator.next();
- Set requiredProperties = new HashSet();
+ Set requiredProperties = new HashSet<>();
[04/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java
index ea8b1b0..603f744 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/ADKerberosOperationHandlerTest.java
@@ -465,7 +465,7 @@ public class ADKerberosOperationHandlerTest extends
KerberosOperationHandlerTest
@Test
public void testDigests() throws Exception {
PrincipalKeyCredential kc = new
PrincipalKeyCredential(DEFAULT_ADMIN_PRINCIPAL, DEFAULT_ADMIN_PASSWORD);
-Map kerberosEnvMap = new HashMap();
+Map kerberosEnvMap = new HashMap<>();
kerberosEnvMap.put(ADKerberosOperationHandler.KERBEROS_ENV_LDAP_URL,
DEFAULT_LDAP_URL);
kerberosEnvMap.put(ADKerberosOperationHandler.KERBEROS_ENV_PRINCIPAL_CONTAINER_DN,
DEFAULT_PRINCIPAL_CONTAINER_DN);
kerberosEnvMap.put(ADKerberosOperationHandler.KERBEROS_ENV_AD_CREATE_ATTRIBUTES_TEMPLATE,
"" +
@@ -560,7 +560,7 @@ public class ADKerberosOperationHandlerTest extends
KerberosOperationHandlerTest
}
PrincipalKeyCredential credentials = new PrincipalKeyCredential(principal,
password);
-Map kerberosEnvMap = new HashMap();
+Map kerberosEnvMap = new HashMap<>();
kerberosEnvMap.put(ADKerberosOperationHandler.KERBEROS_ENV_LDAP_URL,
ldapUrl);
kerberosEnvMap.put(ADKerberosOperationHandler.KERBEROS_ENV_PRINCIPAL_CONTAINER_DN,
containerDN);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/FinalizeKerberosServerActionTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/FinalizeKerberosServerActionTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/FinalizeKerberosServerActionTest.java
index 9404480..8d6ecc3 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/FinalizeKerberosServerActionTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/FinalizeKerberosServerActionTest.java
@@ -82,7 +82,7 @@ public class FinalizeKerberosServerActionTest extends
EasyMockSupport {
replayAll();
-ConcurrentMap requestSharedDataContext = new
ConcurrentHashMap();
+ConcurrentMap requestSharedDataContext = new
ConcurrentHashMap<>();
FinalizeKerberosServerAction action =
injector.getInstance(FinalizeKerberosServerAction.class);
action.setExecutionCommand(executionCommand);
@@ -113,7 +113,7 @@ public class FinalizeKerberosServerActionTest extends
EasyMockSupport {
replayAll();
-ConcurrentMap requestSharedDataContext = new
ConcurrentHashMap();
+ConcurrentMap requestSharedDataContext = new
ConcurrentHashMap<>();
FinalizeKerberosServerAction action =
injector.getInstance(FinalizeKerberosServerAction.class);
action.setExecutionCommand(executionCommand);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java
index 3f9ee42..68f6f6d 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java
@@ -84,7 +84,7 @@ public abstract class KerberosOperationHandlerTest extends
EasyMockSupport {
File file = folder.newFile();
final String principal1 = "princip...@realm.com";
final String principal2 = "princip...@realm.com";
-Set seenEntries = new HashSet();
+Set seenEntries = new HashSet<>();
Assert.assertTrue(handler.createKeytabFile(principal1, "some password", 0,
file));
Assert.assertTrue(handler.createKeytabFile(principal2, "some password", 0,
file));
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerActionTest.java
--
diff --git
a/ambari-server/src/test
[30/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java
index c825497..3654386 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java
@@ -43,7 +43,7 @@ public class ViewInstanceResourceDefinition extends
BaseResourceDefinition {
super(Resource.Type.ViewInstance);
this.subResourceDefinitions = subResourceDefinitions == null ? new
HashSet() :
-new HashSet(subResourceDefinitions);
+ new HashSet<>(subResourceDefinitions);
this.subResourceDefinitions.add(new
SubResourceDefinition(Resource.Type.ViewPrivilege));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java
index f3df120..169af3b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java
@@ -53,7 +53,7 @@ public class ViewVersionResourceDefinition extends
BaseResourceDefinition {
@Override
public Set getSubResourceDefinitions() {
-Set subResourceDefinitions = new
HashSet();
+Set subResourceDefinitions = new HashSet<>();
subResourceDefinitions.add(new
SubResourceDefinition(Resource.Type.ViewInstance));
subResourceDefinitions.add(new
SubResourceDefinition(Resource.Type.ViewPermission));
return subResourceDefinitions;
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WorkflowResourceDefinition.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WorkflowResourceDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WorkflowResourceDefinition.java
index 8ba2618..365e9b3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WorkflowResourceDefinition.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WorkflowResourceDefinition.java
@@ -47,7 +47,7 @@ public class WorkflowResourceDefinition extends
BaseResourceDefinition {
@Override
public Set getSubResourceDefinitions() {
-Set setChildren = new
HashSet();
+Set setChildren = new HashSet<>();
setChildren.add(new SubResourceDefinition(Resource.Type.Job));
return setChildren;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
index 5672598..4aad530 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java
@@ -133,8 +133,8 @@ public class BootStrapResource {
private void normalizeHosts(SshHostInfo info) {
-List validHosts = new ArrayList();
-List newHosts = new ArrayList();
+List validHosts = new ArrayList<>();
+List newHosts = new ArrayList<>();
for (String host: info.getHosts()) {
try {
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java
index 40cd6e0..dd7c917 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java
@@ -68,7 +68,7 @@ public class ActiveWidgetLayoutSe
[22/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/GroupDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/GroupDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/GroupDAO.java
index 8b5902c..638a442 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/GroupDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/GroupDAO.java
@@ -117,7 +117,7 @@ public class GroupDAO {
@Transactional
public void create(GroupEntity group) {
-create(new HashSet(Arrays.asList(group)));
+create(new HashSet<>(Arrays.asList(group)));
}
@Transactional
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java
index 0b6c14a..410f5cf 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAO.java
@@ -68,7 +68,7 @@ public class HostConfigMappingDAO {
if (!cacheLoaded) {
if (hostConfigMappingByHost == null) {
-hostConfigMappingByHost = new ConcurrentHashMap>();
+hostConfigMappingByHost = new ConcurrentHashMap<>();
TypedQuery query =
entityManagerProvider.get().createNamedQuery(
"HostConfigMappingEntity.findAll", HostConfigMappingEntity.class);
@@ -86,7 +86,7 @@ public class HostConfigMappingDAO {
if (hostConfigMappingByHost.containsKey(hostId)) {
setByHost = hostConfigMappingByHost.get(hostId);
} else {
-setByHost = new HashSet();
+setByHost = new HashSet<>();
hostConfigMappingByHost.put(hostId, setByHost);
}
@@ -115,7 +115,7 @@ public class HostConfigMappingDAO {
if (hostConfigMappingByHost.containsKey(hostId)) {
set = hostConfigMappingByHost.get(hostId);
} else {
-set = new HashSet();
+set = new HashSet<>();
hostConfigMappingByHost.put(hostId, set);
}
@@ -133,7 +133,7 @@ public class HostConfigMappingDAO {
if (hostConfigMappingByHost.containsKey(hostId)) {
set = hostConfigMappingByHost.get(hostId);
} else {
-set = new HashSet();
+set = new HashSet<>();
hostConfigMappingByHost.put(hostId, set);
}
@@ -154,7 +154,7 @@ public class HostConfigMappingDAO {
if (!hostConfigMappingByHost.containsKey(hostId))
return Collections.emptySet();
-Set set = new
HashSet(hostConfigMappingByHost.get(hostId));
+Set set = new
HashSet<>(hostConfigMappingByHost.get(hostId));
CollectionUtils.filter(set, new Predicate() {
@@ -176,7 +176,7 @@ public class HostConfigMappingDAO {
if (!hostConfigMappingByHost.containsKey(hostId))
return null;
-Set set = new
HashSet(hostConfigMappingByHost.get(hostId));
+Set set = new
HashSet<>(hostConfigMappingByHost.get(hostId));
HostConfigMapping result = (HostConfigMapping) CollectionUtils.find(set,
new Predicate() {
@@ -198,7 +198,7 @@ public class HostConfigMappingDAO {
if (!hostConfigMappingByHost.containsKey(hostId))
return Collections.emptySet();
-Set set = new
HashSet(hostConfigMappingByHost.get(hostId));
+Set set = new
HashSet<>(hostConfigMappingByHost.get(hostId));
CollectionUtils.filter(set, new Predicate() {
@@ -220,13 +220,13 @@ public class HostConfigMappingDAO {
return Collections.emptySet();
}
-HashSet result = new HashSet();
+HashSet result = new HashSet<>();
for (final Long hostId : hostIds) {
if (!hostConfigMappingByHost.containsKey(hostId))
continue;
- Set set = new
HashSet(hostConfigMappingByHost.get(hostId));
+ Set set = new
HashSet<>(hostConfigMappingByHost.get(hostId));
CollectionUtils.filter(set, new Predicate() {
@@ -249,7 +249,7 @@ public class HostConfigMappingDAO {
Collection types) {
populateCache();
-Map> mappingsByType = new HashMap>();
+Map> mappingsByType = new HashMap<>();
for (String type : types) {
if (!mappingsByType.containsKey(type)) {
@@ -258,7 +258,7 @@ public class HostConfigMappingDAO {
}
if (!types.isEmpty()) {
- List mappings = new ArrayList();
+ List mappings = new ArrayList<>();
for (Set entries : hostConfigMappingBy
[20/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
index 6c89b88..2bc1e68 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
@@ -101,12 +101,12 @@ public class ClustersImpl implements Clusters {
private static final Logger LOG =
LoggerFactory.getLogger(ClustersImpl.class);
- private final ConcurrentHashMap clusters = new
ConcurrentHashMap();
- private final ConcurrentHashMap clustersById = new
ConcurrentHashMap();
- private final ConcurrentHashMap hosts = new
ConcurrentHashMap();
- private final ConcurrentHashMap hostsById = new
ConcurrentHashMap();
- private final ConcurrentHashMap> hostClusterMap = new
ConcurrentHashMap>();
- private final ConcurrentHashMap> clusterHostMap = new
ConcurrentHashMap>();
+ private final ConcurrentHashMap clusters = new
ConcurrentHashMap<>();
+ private final ConcurrentHashMap clustersById = new
ConcurrentHashMap<>();
+ private final ConcurrentHashMap hosts = new
ConcurrentHashMap<>();
+ private final ConcurrentHashMap hostsById = new
ConcurrentHashMap<>();
+ private final ConcurrentHashMap> hostClusterMap = new
ConcurrentHashMap<>();
+ private final ConcurrentHashMap> clusterHostMap = new
ConcurrentHashMap<>();
@Inject
private ClusterDAO clusterDAO;
@@ -324,7 +324,7 @@ public class ClustersImpl implements Clusters {
@Override
public List getHosts() {
-return new ArrayList(hosts.values());
+return new ArrayList<>(hosts.values());
}
@Override
@@ -413,7 +413,7 @@ public class ClustersImpl implements Clusters {
// not stored to DB
Host host = hostFactory.create(hostEntity);
host.setAgentVersion(new AgentVersion(""));
-List emptyDiskList = new CopyOnWriteArrayList();
+List emptyDiskList = new CopyOnWriteArrayList<>();
host.setDisksInfo(emptyDiskList);
host.setHealthStatus(new HostHealthStatus(HealthStatus.UNKNOWN, ""));
host.setHostAttributes(new ConcurrentHashMap());
@@ -486,7 +486,7 @@ public class ClustersImpl implements Clusters {
private Map getHostsMap(Collection hostSet) throws
HostNotFoundException {
-Map hostMap = new HashMap();
+Map hostMap = new HashMap<>();
Host host = null;
for (String hostName : hostSet) {
if (null != hostName) {
@@ -612,7 +612,7 @@ public class ClustersImpl implements Clusters {
public Map getHostsForCluster(String clusterName)
throws AmbariException {
-Map hosts = new HashMap();
+Map hosts = new HashMap<>();
for (Host h : clusterHostMap.get(clusterName)) {
hosts.put(h.getHostName(), h);
}
@@ -623,7 +623,7 @@ public class ClustersImpl implements Clusters {
@Override
public Map getHostIdsForCluster(String clusterName)
throws AmbariException {
-Map hosts = new HashMap();
+Map hosts = new HashMap<>();
for (Host h : clusterHostMap.get(clusterName)) {
HostEntity hostEntity = hostDAO.findByName(h.getHostName());
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java
index 03edcf8..89a03aa 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java
@@ -147,8 +147,8 @@ public class ConfigGroupImpl implements ConfigGroup {
configGroupId = configGroupEntity.getGroupId();
configGroupName = configGroupEntity.getGroupName();
-m_configurations = new ConcurrentHashMap();
-m_hosts = new ConcurrentHashMap();
+m_configurations = new ConcurrentHashMap<>();
+m_hosts = new ConcurrentHashMap<>();
// Populate configs
for (ConfigGroupConfigMappingEntity configMappingEntity :
configGroupEntity.getConfigGroupConfigMappingEntities()) {
@@ -478,17 +478,17 @@ public class ConfigGroupImpl implements ConfigGroup {
@Override
public ConfigGroupResponse convertToResponse() throws AmbariException {
-Set> hostnames = new HashSet>();
+Set> hostnames = new HashSet<>();
for (Host host : m_hosts.values()) {
- Map hostMap = new HashMap();
+ Map hostMap = new HashMap<>();
hostMap.put("host_name", host.getHostName());
[16/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java
index 256fecb..414d2c9 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java
@@ -40,9 +40,9 @@ public class InOperatorTest {
public void testToPredicate() throws Exception {
String prop = "prop";
String val = "one,2,three";
-EqualsPredicate p1 = new EqualsPredicate(prop, "one");
-EqualsPredicate p2 = new EqualsPredicate(prop, "2");
-EqualsPredicate p3 = new EqualsPredicate(prop, "three");
+EqualsPredicate p1 = new EqualsPredicate<>(prop, "one");
+EqualsPredicate p2 = new EqualsPredicate<>(prop, "2");
+EqualsPredicate p3 = new EqualsPredicate<>(prop, "three");
OrPredicate orPredicate = new OrPredicate(p1, p2, p3);
assertEquals(orPredicate, new InOperator().toPredicate(prop, val));
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java
index 6e017b9..1702e33 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java
@@ -38,7 +38,7 @@ public class LessEqualsOperatorTest {
@Test
public void testToPredicate() {
-assertEquals(new LessEqualsPredicate("1", "2"),
+assertEquals(new LessEqualsPredicate<>("1", "2"),
new LessEqualsOperator().toPredicate("1", "2"));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java
index 5311ea7..0f14055 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java
@@ -38,7 +38,7 @@ public class LessOperatorTest {
@Test
public void testToPredicate() {
-assertEquals(new LessPredicate("1", "2"),
+assertEquals(new LessPredicate<>("1", "2"),
new LessOperator().toPredicate("1", "2"));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java
index d8e1f6a..4a28203 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java
@@ -39,7 +39,7 @@ public class NotEqualsOperatorTest {
@Test
public void testToPredicate() {
-assertEquals(new NotPredicate(new EqualsPredicate("prop", "val")),
+assertEquals(new NotPredicate(new EqualsPredicate<>("prop", "val")),
new NotEqualsOperator().toPredicate("prop", "val"));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java
index c23bc3a..ce7c256 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java
@@ -39,7 +39
[25/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
index 0c9a38b..6c4bc1f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
@@ -58,7 +58,7 @@ public class PermissionResourceProvider extends
AbstractResourceProvider {
/**
* The key property ids for a permission resource.
*/
- private static Map keyPropertyIds = new
HashMap();
+ private static Map keyPropertyIds = new HashMap<>();
static {
keyPropertyIds.put(Resource.Type.Permission, PERMISSION_ID_PROPERTY_ID);
}
@@ -66,7 +66,7 @@ public class PermissionResourceProvider extends
AbstractResourceProvider {
/**
* The property ids for a permission resource.
*/
- private static Set propertyIds = new HashSet();
+ private static Set propertyIds = new HashSet<>();
static {
propertyIds.add(PERMISSION_ID_PROPERTY_ID);
propertyIds.add(PERMISSION_NAME_PROPERTY_ID);
@@ -111,7 +111,7 @@ public class PermissionResourceProvider extends
AbstractResourceProvider {
public Set getResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
-Set resources= new HashSet();
+Set resources= new HashSet<>();
Set requestedIds = getRequestPropertyIds(request, predicate);
for(PermissionEntity permissionEntity : permissionDAO.findAll()){
@@ -144,7 +144,7 @@ public class PermissionResourceProvider extends
AbstractResourceProvider {
@Override
protected Set getPKPropertyIds() {
-return new HashSet(keyPropertyIds.values());
+return new HashSet<>(keyPropertyIds.values());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
index d2643b8..010ffea 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
@@ -133,7 +133,7 @@ public class PreUpgradeCheckResourceProvider extends
ReadOnlyResourceProvider {
public Set getResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
-final Set resources = new HashSet();
+final Set resources = new HashSet<>();
final Set requestedIds = getRequestPropertyIds(request, predicate);
final Set> propertyMaps = getPropertyMaps(predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
index 07b98bd..e8bef9e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
@@ -175,9 +175,9 @@ public abstract class PrivilegeResourceProvider extends
AbstractAuthorizedRes
@Override
public Set getResourcesAuthorized(Request request, Predicate
predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
-Set resources= new HashSet();
+Set resources= new HashSet<>();
Set requestedIds = getRequestPropertyIds(request, predicate);
-Set resourceIds = new HashSet();
+Set resourceIds = new HashSet<>();
Set> propertyMaps = getPropertyMaps(predicate);
@@ -195,10 +195,10 @@ public abstract class PrivilegeResourceProvider
extends AbstractAuthorizedRes
resourceIds.addAll(resourceEntities.keySet());
- Set entitySet = new HashSet();
- List us
[10/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
index a386e7f..8ec8603 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
@@ -128,7 +128,7 @@ public class BlueprintResourceProviderTest {
}
private Map>> getSettingProperties() {
-return new HashMap>>();
+return new HashMap<>();
}
@Before
@@ -191,7 +191,7 @@ public class BlueprintResourceProviderTest {
Request request = createMock(Request.class);
Set> setProperties = getBlueprintTestProperties();
-Map requestInfoProperties = new HashMap();
+Map requestInfoProperties = new HashMap<>();
requestInfoProperties.put(Request.REQUEST_INFO_BODY_PROPERTY, null);
// set expectations
@@ -440,7 +440,7 @@ public class BlueprintResourceProviderTest {
BlueprintEntity entity =
createEntity(getBlueprintTestProperties().iterator().next());
-List results = new ArrayList();
+List results = new ArrayList<>();
results.add(entity);
// set expectations
@@ -468,7 +468,7 @@ public class BlueprintResourceProviderTest {
setConfigurationProperties(testProperties);
BlueprintEntity entity = createEntity(testProperties.iterator().next());
-List results = new ArrayList();
+List results = new ArrayList<>();
results.add(entity);
// set expectations
@@ -495,8 +495,8 @@ public class BlueprintResourceProviderTest {
expectLastCall();
replay(dao);
-Predicate predicate = new EqualsPredicate(
-BlueprintResourceProvider.BLUEPRINT_NAME_PROPERTY_ID, BLUEPRINT_NAME);
+Predicate predicate = new EqualsPredicate<>(
+ BlueprintResourceProvider.BLUEPRINT_NAME_PROPERTY_ID, BLUEPRINT_NAME);
AbstractResourceProviderTest.TestObserver observer = new
AbstractResourceProviderTest.TestObserver();
provider.addObserver(observer);
@@ -518,7 +518,7 @@ public class BlueprintResourceProviderTest {
Set> setProperties = getBlueprintTestProperties();
setConfigurationProperties(setProperties);
AmbariManagementController managementController =
createMock(AmbariManagementController.class);
-Map requestInfoProperties = new HashMap();
+Map requestInfoProperties = new HashMap<>();
Map>> settingProperties =
getSettingProperties();
requestInfoProperties.put(Request.REQUEST_INFO_BODY_PROPERTY,
"{\"configurations\":[]}");
Request request = createMock(Request.class);
@@ -567,7 +567,7 @@ public class BlueprintResourceProviderTest {
Set> setProperties = getBlueprintTestProperties();
setConfigurationProperties(setProperties);
AmbariManagementController managementController =
createMock(AmbariManagementController.class);
-Map requestInfoProperties = new HashMap();
+Map requestInfoProperties = new HashMap<>();
Map>> settingProperties =
getSettingProperties();
requestInfoProperties.put(Request.REQUEST_INFO_BODY_PROPERTY,
"{\"configurations\":[{\"configuration-type\":{\"properties\":{\"property\":\"value\"}}}]}");
Request request = createMock(Request.class);
@@ -618,7 +618,7 @@ public class BlueprintResourceProviderTest {
Set> setProperties = getBlueprintTestProperties();
-Map requestInfoProperties = new HashMap();
+Map requestInfoProperties = new HashMap<>();
String configurationData =
"{\"configurations\":[{\"config-type1\":{\"properties\"
:{\"property\":\"property-value\"}},"
+ "\"config-type2\" : {\"properties_attributes\" : {\"property\" :
\"property-value\"}, \"properties\" : {\"property\" : \"property-value\"}}}"
+ "]}";
@@ -649,7 +649,7 @@ public class BlueprintResourceProviderTest {
Set> setProperties = getBlueprintTestProperties();
-Map requestInfoProperties = new HashMap();
+Map requestInfoProperties = new HashMap<>();
String configurationData = "{\"configurations\":[\"config-type1\",
\"config-type2\"]}";
requestInfoProperties.put(Request.REQUEST_INFO_BODY_PROPERTY,
configurationData);
@@ -678,7 +678,7 @@ public class BlueprintResourceProviderTest {
Set> setProperties = getBlueprintTestProperties();
-Map requestInfoProperties = new HashMap();
+Map requestInfoProperties = new HashMap<>();
String configurationData = "{\"configurations\":{\"config-type1\":
\"properties\", \"config-type2\": \"properties\"}}";
requestInfoProperties.put(Request.REQUEST_INFO_BODY_PROPERTY,
configurationData);
@@
[03/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java
index 76146b5..d479ca2 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java
@@ -105,7 +105,7 @@ public class ClusterDeadlockTest {
/**
*
*/
- private List hostNames = new ArrayList(NUMBER_OF_HOSTS);
+ private List hostNames = new ArrayList<>(NUMBER_OF_HOSTS);
/**
* Creates 100 hosts and adds them to the cluster.
@@ -130,7 +130,7 @@ public class ClusterDeadlockTest {
Config config2 = configFactory.createNew(cluster, "test-type2",
"version1", new HashMap(), new HashMap>());
-cluster.addDesiredConfig("test user", new
HashSet(Arrays.asList(config1, config2)));
+cluster.addDesiredConfig("test user", new HashSet<>(Arrays.asList(config1,
config2)));
// 100 hosts
for (int i = 0; i < NUMBER_OF_HOSTS; i++) {
@@ -170,7 +170,7 @@ public class ClusterDeadlockTest {
ServiceComponentHost dataNodeSCH = createNewServiceComponentHost("HDFS",
"DATANODE", "c64-0");
-List threads = new ArrayList();
+List threads = new ArrayList<>();
for (int i = 0; i < NUMBER_OF_THREADS; i++) {
DeadlockExerciserThread thread = new DeadlockExerciserThread();
thread.setCluster(cluster);
@@ -209,7 +209,7 @@ public class ClusterDeadlockTest {
ServiceComponent nameNodeComponent =
service.getServiceComponent("NAMENODE");
ServiceComponent dataNodeComponent =
service.getServiceComponent("DATANODE");
-List threads = new ArrayList();
+List threads = new ArrayList<>();
for (int i = 0; i < 5; i++) {
ServiceComponentReaderWriterThread thread = new
ServiceComponentReaderWriterThread();
thread.setDataNodeComponent(dataNodeComponent);
@@ -241,7 +241,7 @@ public class ClusterDeadlockTest {
@Test()
public void testDeadlockWhileRestartingComponents() throws Exception {
// for each host, install both components
-List serviceComponentHosts = new
ArrayList();
+List serviceComponentHosts = new ArrayList<>();
for (String hostName : hostNames) {
serviceComponentHosts.add(createNewServiceComponentHost("HDFS",
"NAMENODE", hostName));
@@ -250,7 +250,7 @@ public class ClusterDeadlockTest {
"DATANODE", hostName));
}
-List threads = new ArrayList();
+List threads = new ArrayList<>();
for (int i = 0; i < NUMBER_OF_THREADS; i++) {
ClusterReaderThread clusterReaderThread = new ClusterReaderThread();
ClusterWriterThread clusterWriterThread = new ClusterWriterThread();
@@ -281,7 +281,7 @@ public class ClusterDeadlockTest {
@Test
public void testDeadlockWithConfigsUpdate() throws Exception {
-List threads = new ArrayList();
+List threads = new ArrayList<>();
for (int i = 0; i < NUMBER_OF_THREADS; i++) {
ClusterDesiredConfigsReaderThread readerThread = null;
for (int j = 0; j < NUMBER_OF_THREADS; j++) {
@@ -559,7 +559,7 @@ public class ClusterDeadlockTest {
}
private void setOsFamily(Host host, String osFamily, String osVersion) {
-Map hostAttributes = new HashMap(2);
+Map hostAttributes = new HashMap<>(2);
hostAttributes.put("os_family", osFamily);
hostAttributes.put("os_release_version", osVersion);
host.setHostAttributes(hostAttributes);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
index 3172571..76f9130 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
@@ -75,7 +75,7 @@ public class ClusterImplTest {
@Test
public void testAddSessionAttributes() throws Exception {
-Map attributes = new HashMap();
+Map attributes = new HashMap<>();
attributes.put("foo", "bar");
AmbariSessionManager sessionManager =
createMock(AmbariSessionManager.class);
@@ -101,14 +101,14 @@ public class ClusterImplTest {
@Test
public void testSetSessionAttribute() throws Exception {
-Map attributes = new HashMap();
+Map attributes = new HashMap<>();
attributes.put("foo", "bar");
attributes.put("foo2
[13/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index bf6c41a..483880a 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -296,7 +296,7 @@ public class AmbariManagementControllerTest {
private void setOsFamily(Host host, String osFamily, String osVersion) {
-Map hostAttributes = new HashMap();
+Map hostAttributes = new HashMap<>();
hostAttributes.put("os_family", osFamily);
hostAttributes.put("os_release_version", osVersion);
@@ -341,7 +341,7 @@ public class AmbariManagementControllerTest {
dStateStr = desiredState.toString();
}
ServiceRequest r1 = new ServiceRequest(clusterName, serviceName,
dStateStr);
-Set requests = new HashSet();
+Set requests = new HashSet<>();
requests.add(r1);
ServiceResourceProviderTest.createServices(controller, requests);
@@ -357,7 +357,7 @@ public class AmbariManagementControllerTest {
ServiceComponentRequest r = new ServiceComponentRequest(clusterName,
serviceName, componentName, dStateStr);
Set requests =
-new HashSet();
+ new HashSet<>();
requests.add(r);
ComponentResourceProviderTest.createComponents(controller, requests);
}
@@ -372,7 +372,7 @@ public class AmbariManagementControllerTest {
ServiceComponentHostRequest r = new
ServiceComponentHostRequest(clusterName,
serviceName, componentName, hostname, dStateStr);
Set requests =
-new HashSet();
+ new HashSet<>();
requests.add(r);
controller.createHostComponents(requests);
}
@@ -387,7 +387,7 @@ public class AmbariManagementControllerTest {
ServiceComponentHostRequest r = new
ServiceComponentHostRequest(clusterName,
serviceName, componentName, hostname, dStateStr);
Set requests =
-new HashSet();
+ new HashSet<>();
requests.add(r);
controller.deleteHostComponents(requests);
}
@@ -396,8 +396,8 @@ public class AmbariManagementControllerTest {
List hosts, List configs)
throws AmbariException {
-Map hostMap = new HashMap();
-Map configMap = new HashMap();
+Map hostMap = new HashMap<>();
+Map configMap = new HashMap<>();
for (String hostname : hosts) {
Host host = clusters.getHost(hostname);
@@ -421,9 +421,9 @@ public class AmbariManagementControllerTest {
boolean runSmokeTests, boolean reconfigureClients) throws
AmbariException, AuthorizationException {
ServiceRequest r = new ServiceRequest(clusterName, serviceName,
State.INSTALLED.toString());
-Set requests = new HashSet();
+Set requests = new HashSet<>();
requests.add(r);
-Map mapRequestProps = new HashMap();
+Map mapRequestProps = new HashMap<>();
mapRequestProps.put("context", "Called from a test");
RequestStatusResponse resp =
ServiceResourceProviderTest.updateServices(controller, requests,
mapRequestProps, runSmokeTests, reconfigureClients);
@@ -449,7 +449,7 @@ public class AmbariManagementControllerTest {
Cluster c = clusters.getCluster(clusterName);
Service s = c.getService(serviceName);
Set requests = new
- HashSet();
+ HashSet<>();
for (ServiceComponent sc : s.getServiceComponents().values()) {
for (ServiceComponentHost sch : sc.getServiceComponentHosts().values()) {
ServiceComponentHostRequest schr = new ServiceComponentHostRequest
@@ -458,7 +458,7 @@ public class AmbariManagementControllerTest {
requests.add(schr);
}
}
-Map mapRequestProps = new HashMap();
+Map mapRequestProps = new HashMap<>();
mapRequestProps.put("context", "Called from a test");
RequestStatusResponse resp =
HostComponentResourceProviderTest.updateHostComponents(controller, injector,
requests,
mapRequestProps, false);
@@ -487,9 +487,9 @@ public class AmbariManagementControllerTest {
AmbariException, AuthorizationException {
ServiceRequest r = new ServiceRequest(clusterName, serviceName,
State.STARTED.toString());
-Set requests = new HashSet();
+Set requests = new HashSet<>();
requests.add(r);
-Map mapRequestProps = new HashMap();
+Map mapRequestProps = new HashMap<>();
mapRequestProps.put("context", "Called from a test");
RequestStatusResponse resp =
ServiceResourceProviderTest.updateServices(controller, requests,
mapRequestProps, run
[06/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
index 2225997..bb3240b 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
@@ -219,7 +219,7 @@ public class JMXPropertyProviderTest {
Request request =
PropertyHelper.getReadRequest(Collections.emptySet());
Assert.assertEquals(1,
propertyProvider.populateResources(Collections.singleton(resource), request,
null).size());
-List expectedSpecs = new ArrayList();
+List expectedSpecs = new ArrayList<>();
expectedSpecs.add(propertyProvider.getSpec("http",
"domu-12-31-39-0e-34-e1.compute-1.internal", "50070", "/jmx"));
expectedSpecs.add(propertyProvider.getSpec("http",
"domu-12-31-39-0e-34-e1.compute-1.internal", "50070",
"/jmx?get=Hadoop:service=NameNode,name=FSNamesystem::tag.HAState"));
Assert.assertEquals(expectedSpecs, streamProvider.getSpecs());
@@ -258,7 +258,7 @@ public class JMXPropertyProviderTest {
// only ask for specific properties
-Set properties = new HashSet();
+Set properties = new HashSet<>();
// hbase master
resource = new ResourceImpl(Resource.Type.HostComponent);
@@ -268,7 +268,7 @@ public class JMXPropertyProviderTest {
resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
// only ask for specific properties
-properties = new HashSet();
+properties = new HashSet<>();
properties.add(PropertyHelper.getPropertyId("metrics/jvm",
"HeapMemoryMax"));
properties.add(PropertyHelper.getPropertyId("metrics/jvm",
"HeapMemoryUsed"));
properties.add(PropertyHelper.getPropertyId("metrics/jvm",
"NonHeapMemoryMax"));
@@ -313,7 +313,7 @@ public class JMXPropertyProviderTest {
resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
// only ask for one property
-Map temporalInfoMap = new HashMap();
+Map temporalInfoMap = new HashMap<>();
Request request =
PropertyHelper.getReadRequest(Collections.singleton("metrics/rpc/ReceivedBytes"),
temporalInfoMap);
Assert.assertEquals(1,
propertyProvider.populateResources(Collections.singleton(resource), request,
null).size());
@@ -349,12 +349,12 @@ public class JMXPropertyProviderTest {
// request with an empty set should get all supported properties
// only ask for one property
-Map temporalInfoMap = new HashMap();
+Map temporalInfoMap = new HashMap<>();
Request request =
PropertyHelper.getReadRequest(Collections.singleton("metrics/dfs"),
temporalInfoMap);
Assert.assertEquals(1,
propertyProvider.populateResources(Collections.singleton(resource), request,
null).size());
-List expectedSpecs = new ArrayList();
+List expectedSpecs = new ArrayList<>();
expectedSpecs.add(propertyProvider.getSpec("http",
"domu-12-31-39-0e-34-e1.compute-1.internal", "50070", "/jmx"));
expectedSpecs.add(propertyProvider.getSpec("http",
"domu-12-31-39-0e-34-e1.compute-1.internal", "50070",
"/jmx?get=Hadoop:service=NameNode,name=FSNamesystem::tag.HAState"));
Assert.assertEquals(expectedSpecs, streamProvider.getSpecs());
@@ -389,12 +389,12 @@ public class JMXPropertyProviderTest {
// request with an empty set should get all supported properties
// only ask for one property
-Map temporalInfoMap = new HashMap();
+Map temporalInfoMap = new HashMap<>();
Request request =
PropertyHelper.getReadRequest(Collections.singleton("metrics/dfs/FSNamesystem"),
temporalInfoMap);
Assert.assertEquals(1,
propertyProvider.populateResources(Collections.singleton(resource), request,
null).size());
-List expectedSpecs = new ArrayList();
+List expectedSpecs = new ArrayList<>();
expectedSpecs.add(propertyProvider.getSpec("http","domu-12-31-39-0e-34-e1.compute-1.internal","50070","/jmx"));
expectedSpecs.add(propertyProvider.getSpec("http",
"domu-12-31-39-0e-34-e1.compute-1.internal", "50070",
"/jmx?get=Hadoop:service=NameNode,name=FSNamesystem::tag.HAState"));
@@ -417,7 +417,7 @@ public class JMXPropertyProviderTest {
// request with an empty set should get all supported properties
// only ask for one property
-temporalInfoMap = new HashMap();
+temporalInfoMap = new HashMap<>();
request =
PropertyHelper.getReadRequest(Collections.singleton("metrics/dfs/FSNamesystem/CapacityUsed"),
temporalInfoMap);
Assert.assertEquals(1,
propertyProvider.populateResources(Collections.singleton(resource), requ
[29/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java
index 87cb6ac..b5b4a42 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java
@@ -60,7 +60,7 @@ public class ValidationService extends BaseService {
}
ResourceInstance createValidationResource(String stackName, String
stackVersion) {
-Map mapIds = new HashMap();
+Map mapIds = new HashMap<>();
mapIds.put(Resource.Type.Stack, stackName);
mapIds.put(Resource.Type.StackVersion, stackVersion);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java
index 6410bd8..af1eb07 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java
@@ -70,7 +70,7 @@ public class VersionDefinitionService extends BaseService {
*/
@Path("{versionNumber}/operating_systems")
public OperatingSystemService
getOperatingSystemsHandler(@PathParam("versionNumber") String versionNumber) {
-final Map mapIds = new HashMap();
+final Map mapIds = new HashMap<>();
mapIds.put(Resource.Type.VersionDefinition, versionNumber);
return new OperatingSystemService(mapIds);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewExternalSubResourceService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewExternalSubResourceService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewExternalSubResourceService.java
index 66ccae7..515d4ac 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewExternalSubResourceService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewExternalSubResourceService.java
@@ -64,7 +64,7 @@ public class ViewExternalSubResourceService extends
BaseService {
/**
* Mapping of resource names to services.
*/
- private final Map resourceServiceMap = new HashMap();
+ private final Map resourceServiceMap = new HashMap<>();
// - Constructors --
@@ -137,7 +137,7 @@ public class ViewExternalSubResourceService extends
BaseService {
* @return a view instance resource
*/
private ResourceInstance createResource(String viewName, String
instanceName) {
-Map mapIds = new HashMap();
+Map mapIds = new HashMap<>();
mapIds.put(Resource.Type.View, viewName);
mapIds.put(Resource.Type.ViewVersion, version);
mapIds.put(Resource.Type.ViewInstance, instanceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
index 53d4918..b10738d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewInstanceService.java
@@ -257,7 +257,7 @@ public class ViewInstanceService extends BaseService {
* @return a view instance resource
*/
private ResourceInstance createResource(String viewName, String viewVersion,
String instanceName) {
-Map mapIds = new HashMap();
+Map mapIds = new HashMap<>();
mapIds.put(Resource.Type.View, viewName);
mapIds.put(Resource.Type.ViewVersion, viewVersion);
mapIds.put(Resource.Type.ViewInstance, instanceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewPermissionService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/service
[05/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcherTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcherTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcherTest.java
index 78f8ba0..68e7d02 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcherTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AlertScriptDispatcherTest.java
@@ -167,7 +167,7 @@ public class AlertScriptDispatcherTest {
notification.CallbackIds =
Collections.singletonList(UUID.randomUUID().toString());
// put the custom config value
-notification.DispatchProperties = new HashMap();
+notification.DispatchProperties = new HashMap<>();
notification.DispatchProperties.put(AlertScriptDispatcher.DISPATCH_PROPERTY_SCRIPT_CONFIG_KEY,
customScriptKey);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcherTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcherTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcherTest.java
index 64f1c8f..7b248ff 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcherTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcherTest.java
@@ -91,7 +91,7 @@ public class AmbariSNMPDispatcherTest {
Notification notification = mock(AlertNotification.class);
notification.Callback = mock(DispatchCallback.class);
notification.CallbackIds = new ArrayList<>();
-Map properties = new HashMap();
+Map properties = new HashMap<>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
properties.put(AmbariSNMPDispatcher.SNMP_VERSION_PROPERTY, "SNMPv1");
@@ -110,7 +110,7 @@ public class AmbariSNMPDispatcherTest {
Notification notification = mock(AlertNotification.class);
notification.Callback = mock(DispatchCallback.class);
notification.CallbackIds = new ArrayList<>();
-notification.DispatchProperties = new HashMap();
+notification.DispatchProperties = new HashMap<>();
dispatcher.dispatch(notification);
verify(notification.Callback).onFailure(notification.CallbackIds);
verify(notification.Callback,
never()).onSuccess(notification.CallbackIds);
@@ -122,7 +122,7 @@ public class AmbariSNMPDispatcherTest {
Notification notification = getAlertNotification(true);
notification.Callback = mock(DispatchCallback.class);
notification.CallbackIds = new ArrayList<>();
-Map properties = new HashMap();
+Map properties = new HashMap<>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
properties.put(AmbariSNMPDispatcher.SNMP_VERSION_PROPERTY, "SNMPv1");
@@ -138,12 +138,12 @@ public class AmbariSNMPDispatcherTest {
Notification notification = getAlertNotification(true);
notification.Callback = mock(DispatchCallback.class);
notification.CallbackIds = new ArrayList<>();
-Map properties = new HashMap();
+Map properties = new HashMap<>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
properties.put(AmbariSNMPDispatcher.SNMP_VERSION_PROPERTY, "SNMPv1");
notification.DispatchProperties = properties;
-notification.Recipients = new ArrayList();
+notification.Recipients = new ArrayList<>();
dispatcher.dispatch(notification);
verify(notification.Callback).onFailure(notification.CallbackIds);
verify(notification.Callback,
never()).onSuccess(notification.CallbackIds);
@@ -155,7 +155,7 @@ public class AmbariSNMPDispatcherTest {
Notification notification = mock(AlertNotification.class);
notification.Callback = mock(DispatchCallback.class);
notification.CallbackIds = new ArrayList<>();
-Map properties = new HashMap();
+Map properties = new HashMap<>();
properties.put(AmbariSNMPDispatcher.PORT_PROPERTY, "3");
properties.put(AmbariSNMPDispatcher.COMMUNITY_PROPERTY, "4");
properties.put(AmbariSNMPDispatcher.SNMP_VE
[12/32] ambari git commit: AMBARI-19149. Code cleanup: redundant type arguments
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
index 466b998..f546aab 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
@@ -51,7 +51,7 @@ public class AbstractJDBCResourceProviderTest {
@Test
public void test() throws SQLException {
-Set requestedIds = new TreeSet();
+Set requestedIds = new TreeSet<>();
requestedIds.add(property1);
requestedIds.add("none1");
requestedIds.add(property2);
@@ -129,7 +129,7 @@ public class AbstractJDBCResourceProviderTest {
@Override
protected Map getDBFieldMap() {
- Map fields = new HashMap();
+ Map fields = new HashMap<>();
fields.put(property1, TestFields.field1);
fields.put(property2, TestFields.field2);
return fields;
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
index ed16d68..c761323 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
@@ -66,7 +66,7 @@ public class AbstractResourceProviderTest {
@Test
public void testCheckPropertyIds() {
-Set propertyIds = new HashSet();
+Set propertyIds = new HashSet<>();
propertyIds.add("foo");
propertyIds.add("cat1/foo");
propertyIds.add("cat2/bar");
@@ -75,7 +75,7 @@ public class AbstractResourceProviderTest {
propertyIds.add("cat4/sub2/sub3/bat");
propertyIds.add("cat5/subcat5/map");
-Map keyPropertyIds = new HashMap();
+Map keyPropertyIds = new HashMap<>();
AmbariManagementController managementController =
createMock(AmbariManagementController.class);
MaintenanceStateHelper maintenanceStateHelper =
createNiceMock(MaintenanceStateHelper.class);
@@ -105,7 +105,7 @@ public class AbstractResourceProviderTest {
@Test
public void testGetPropertyIds() {
-Set propertyIds = new HashSet();
+Set propertyIds = new HashSet<>();
propertyIds.add("p1");
propertyIds.add("foo");
propertyIds.add("cat1/foo");
@@ -114,7 +114,7 @@ public class AbstractResourceProviderTest {
propertyIds.add("cat3/sub1/bam");
propertyIds.add("cat4/sub2/sub3/bat");
-Map keyPropertyIds = new HashMap();
+Map keyPropertyIds = new HashMap<>();
AmbariManagementController managementController =
createMock(AmbariManagementController.class);
MaintenanceStateHelper maintenanceStateHelper =
createNiceMock(MaintenanceStateHelper.class);
@@ -131,8 +131,8 @@ public class AbstractResourceProviderTest {
@Test
public void testGetRequestStatus() {
-Set propertyIds = new HashSet();
-Map keyPropertyIds = new HashMap();
+Set propertyIds = new HashSet<>();
+Map keyPropertyIds = new HashMap<>();
AmbariManagementController managementController =
createMock(AmbariManagementController.class);
MaintenanceStateHelper maintenanceStateHelper =
createNiceMock(MaintenanceStateHelper.class);
replay(maintenanceStateHelper);
@@ -177,7 +177,7 @@ public class AbstractResourceProviderTest {
public void testGetPropertyMaps() throws Exception {
AbstractResourceProvider provider = new TestResourceProvider();
-Map updatePropertyMap = new HashMap();
+Map updatePropertyMap = new HashMap<>();
updatePropertyMap.put("SomeProperty", "SomeUpdateValue");
updatePropertyMap.put("SomeOtherProperty", 99);
@@ -797,26 +797,26 @@ public class AbstractResourceProviderTest {
private static Resource.Type testResourceType = new
Resource.Type("testResource");
private static Set pkPropertyIds =
- new HashSet(Arrays.asList(new String[]{
- "ClusterName",
- "ResourceName"}));
+new HashSet<>(Arrays.asList(new String[]{
+ "ClusterName",
+ "ResourceName"}));
private static Set propertyIds =
- new HashSet(Arrays.asList(new String[]{
- "ClusterName",
- "ResourceName",
- "SomePr
ambari git commit: AMBARI-22244. Update service component API call to work for second service instance (adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-14714 58c833946 -> 17e4330db
AMBARI-22244. Update service component API call to work for second service
instance (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/17e4330d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/17e4330d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/17e4330d
Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 17e4330db3f4813db035e31cd0d4be254c6ecd02
Parents: 58c8339
Author: Attila Doroszlai
Authored: Mon Oct 9 13:46:56 2017 +0200
Committer: Attila Doroszlai
Committed: Tue Oct 17 20:23:05 2017 +0200
--
.../actionmanager/ExecutionCommandWrapper.java | 6 --
.../apache/ambari/server/agent/HeartBeatHandler.java | 2 +-
.../server/alerts/ComponentVersionAlertRunnable.java | 2 +-
.../ambari/server/api/services/AmbariMetaInfo.java | 2 +-
.../ambari/server/api/services/ComponentService.java | 8
.../server/checks/ComponentsExistInRepoCheck.java| 7 ---
.../apache/ambari/server/checks/ServicesUpCheck.java | 4 +---
.../controller/AmbariActionExecutionHelper.java | 6 +++---
.../AmbariCustomCommandExecutionHelper.java | 8
.../controller/AmbariManagementControllerImpl.java | 10 +-
.../internal/ClientConfigResourceProvider.java | 15 ++-
.../ClusterStackVersionResourceProvider.java | 7 ---
.../internal/ComponentResourceProvider.java | 8
.../internal/HostStackVersionResourceProvider.java | 4 ++--
.../controller/internal/ServiceResourceProvider.java | 2 +-
.../internal/StackDefinedPropertyProvider.java | 2 +-
.../logging/LoggingSearchPropertyProvider.java | 2 +-
.../metrics/timeline/AMSPropertyProvider.java| 2 +-
.../server/controller/utilities/DatabaseChecker.java | 2 +-
.../state/DefaultServiceCalculatedState.java | 2 +-
.../utilities/state/HBaseServiceCalculatedState.java | 2 +-
.../utilities/state/HDFSServiceCalculatedState.java | 2 +-
.../utilities/state/HiveServiceCalculatedState.java | 2 +-
.../utilities/state/OozieServiceCalculatedState.java | 2 +-
.../utilities/state/YARNServiceCalculatedState.java | 2 +-
.../alerts/AlertMaintenanceModeListener.java | 2 +-
.../listeners/alerts/AlertServiceStateListener.java | 2 +-
.../upgrade/HostVersionOutOfSyncListener.java| 3 +--
.../listeners/upgrade/StackVersionListener.java | 2 +-
.../org/apache/ambari/server/mpack/MpackManager.java | 2 +-
.../serveraction/upgrades/FinalizeUpgradeAction.java | 2 +-
.../org/apache/ambari/server/state/ConfigHelper.java | 10 +-
.../ambari/server/state/ServiceComponentImpl.java| 4 ++--
.../org/apache/ambari/server/state/ServiceImpl.java | 3 ++-
.../apache/ambari/server/state/UpgradeHelper.java| 2 +-
.../server/state/alert/AlertDefinitionHash.java | 4 ++--
.../ambari/server/state/cluster/ClusterImpl.java | 2 +-
.../apache/ambari/server/state/host/HostImpl.java| 2 +-
.../state/stack/upgrade/HostOrderGrouping.java | 2 +-
.../state/stack/upgrade/ServiceCheckGrouping.java| 2 +-
.../state/svccomphost/ServiceComponentHostImpl.java | 2 +-
.../svccomphost/ServiceComponentHostSummary.java | 1 -
42 files changed, 78 insertions(+), 80 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/17e4330d/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
index ff13d0b..ed2819a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
@@ -237,11 +237,13 @@ public class ExecutionCommandWrapper {
// set the repository version for the component this command is for -
// always use the current desired version
String serviceName = executionCommand.getServiceName();
+String serviceType = null;
try {
RepositoryVersionEntity repositoryVersion = null;
if (!StringUtils.isEmpty(serviceName)) {
Service service = cluster.getService(serviceName);
if (null != service) {
+ serviceType = service.getServiceType();
repositoryVersion = service.getDesiredRepositoryVersion();
String componentName = executionCommand.getComponentName();
@@ -273,9 +275,9 @@ public cl
ambari git commit: AMBARI-22279. Knox upgrade failed when migrating from IOP to HDP (adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 0da1de119 -> 0fc8e9036
AMBARI-22279. Knox upgrade failed when migrating from IOP to HDP (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0fc8e903
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0fc8e903
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0fc8e903
Branch: refs/heads/branch-2.6
Commit: 0fc8e9036c198917cded91fff7aacb63b8bc27db
Parents: 0da1de1
Author: Attila Doroszlai
Authored: Fri Oct 20 16:01:12 2017 +0200
Committer: Attila Doroszlai
Committed: Fri Oct 20 16:49:36 2017 +0200
--
.../common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py | 2 ++
.../resources/stacks/BigInsights/4.0/configuration/cluster-env.xml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fc8e903/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 7f2101d..da6a8a0 100644
---
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -70,6 +70,8 @@ stack_supports_core_site_for_ranger_plugin =
check_stack_feature(StackFeature.CO
upgrade_from_version = upgrade_summary.get_source_version()
source_stack = default("/commandParams/source_stack", None)
+if source_stack is None:
+ source_stack = upgrade_summary.get_source_stack("KNOX")
source_stack_name = get_stack_name(source_stack)
if source_stack_name is not None and source_stack_name != stack_name:
source_stack_root = get_stack_root(source_stack_name,
default('/configurations/cluster-env/stack_root', None))
http://git-wip-us.apache.org/repos/asf/ambari/blob/0fc8e903/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
index 7c4a8a1..54e7f56 100755
---
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
@@ -323,7 +323,7 @@ gpgcheck=0
{"BigInsights":"/usr/iop"}
JSON which defines the stack root by stack name
- true
+ false
false
false
ambari git commit: AMBARI-22326. String formatting problems
Repository: ambari
Updated Branches:
refs/heads/trunk 4103b87e9 -> e455a642d
AMBARI-22326. String formatting problems
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e455a642
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e455a642
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e455a642
Branch: refs/heads/trunk
Commit: e455a642dd6f3b54354482b9b9cdef6f59af11b7
Parents: 4103b87
Author: Attila Doroszlai
Authored: Fri Oct 27 14:28:44 2017 +0200
Committer: Attila Doroszlai
Committed: Fri Oct 27 16:40:00 2017 +0200
--
.../ambari/server/controller/internal/ServiceResourceProvider.java | 2 +-
.../java/org/apache/ambari/server/stack/MasterHostResolver.java| 2 +-
.../main/java/org/apache/ambari/server/state/UpgradeContext.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e455a642/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 e65693b..e55a380 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
@@ -435,7 +435,7 @@ public class ServiceResourceProvider extends
AbstractControllerResourceProvider
if (repositoryVersion.getType() != RepositoryType.STANDARD
&& cluster.getProvisioningState() == State.INIT) {
throw new AmbariException(String.format(
-"Unable to add %s to %s because the cluster is still being
provisioned and the repository for the service is not %s: $s",
+"Unable to add %s to %s because the cluster is still being
provisioned and the repository for the service is not %s: %s",
request.getServiceName(), cluster.getClusterName(),
RepositoryType.STANDARD,
repositoryVersion));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e455a642/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
index fc657c1..99211cb 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
@@ -310,7 +310,7 @@ public class MasterHostResolver {
if (!componentHosts.contains(hp.host)){
//This may happen when NN HA is configured on dual network card
machines with public/private FQDNs.
LOG.error(
- String.format(
+ MessageFormat.format(
"Hadoop NameNode HA configuration {0} contains host {1} that
does not exist in the NameNode hosts list {3}",
key, hp.host, componentHosts.toString()));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e455a642/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 cb44adb..2b91bac 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
@@ -1197,7 +1197,7 @@ public class UpgradeContext {
} catch
(NoSuchResourceException|SystemException|UnsupportedPropertyException|NoSuchParentResourceException
e) {
throw new AmbariException(
String.format("Unable to perform %s. Prerequisite checks could not
be run",
-direction.getText(false), e));
+direction.getText(false)), e);
}
List failedResources = new LinkedList<>();
[1/2] ambari git commit: AMBARI-20855 Removing unused script: relocate_host_components.py (Attila Magyar via adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 ef7578f1f -> e3674352f
refs/heads/trunk 34761fcdc -> 2b146d9c4
AMBARI-20855 Removing unused script: relocate_host_components.py (Attila Magyar
via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b146d9c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b146d9c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b146d9c
Branch: refs/heads/trunk
Commit: 2b146d9c421b12d2b11def840aca69d1dead4428
Parents: 34761fc
Author: Attila Magyar
Authored: Tue May 2 17:34:26 2017 +0200
Committer: Attila Doroszlai
Committed: Tue May 2 17:34:26 2017 +0200
--
.../scripts/relocate_host_components.py | 489 ---
1 file changed, 489 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b146d9c/ambari-server/src/main/resources/scripts/relocate_host_components.py
--
diff --git
a/ambari-server/src/main/resources/scripts/relocate_host_components.py
b/ambari-server/src/main/resources/scripts/relocate_host_components.py
deleted file mode 100644
index 1b9ad1e..000
--- a/ambari-server/src/main/resources/scripts/relocate_host_components.py
+++ /dev/null
@@ -1,489 +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 optparse
-import sys
-import os
-import logging
-import tempfile
-import urllib2
-import socket
-import json
-import base64
-import time
-
-AMBARI_HOSTNAME = None
-AMBARI_PORT = 8080
-CLUSTER_NAME = None
-PROTOCOL = "http"
-USERNAME = "admin"
-PASSWORD = "admin"
-DEFAULT_TIMEOUT = 10 # seconds
-START_ON_RELOCATE = False
-
-# Supported Actions
-RELOCATE_ACTION = 'relocate'
-ALLOWED_ACTUAL_STATES_FOR_RELOCATE = [ 'INIT', 'UNKNOWN', 'DISABLED',
'UNINSTALLED' ]
-ALLOWED_HOST_STATUS_FOR_RELOCATE = [ 'HEALTHY' ]
-STATUS_WAIT_TIMEOUT = 120 # seconds
-STATUS_CHECK_INTERVAL = 10 # seconds
-
-# API calls
-GET_CLUSTERS_URI = "/api/v1/clusters/"
-GET_HOST_COMPONENTS_URI = "/api/v1/clusters/{0}/services/{1}/components/{2}" +\
- "?fields=host_components"
-GET_HOST_COMPONENT_DESIRED_STATE_URI = "/api/v1/clusters/{0}/hosts/{1}" +\
- "/host_components/{2}" +\
- "?fields=HostRoles/desired_state"
-GET_HOST_COMPONENT_STATE_URI = "/api/v1/clusters/{0}/hosts/{1}" +\
- "/host_components/{2}" +\
- "?fields=HostRoles/state"
-GET_HOST_STATE_URL = "/api/v1/clusters/{0}/hosts/{1}?fields=Hosts/host_state"
-HOST_COMPONENT_URI = "/api/v1/clusters/{0}/hosts/{1}/host_components/{2}"
-ADD_HOST_COMPONENT_URI = "/api/v1/clusters/{0}/hosts?Hosts/host_name={1}"
-
-logger = logging.getLogger()
-
-
-
-class PreemptiveBasicAuthHandler(urllib2.BaseHandler):
-
- def __init__(self):
-password_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
-password_mgr.add_password(None, getUrl(''), USERNAME, PASSWORD)
-self.passwd = password_mgr
-self.add_password = self.passwd.add_password
-
- def http_request(self, req):
-uri = req.get_full_url()
-user = USERNAME
-pw = PASSWORD
-raw = "%s:%s" % (user, pw)
-auth = 'Basic %s' % base64.b64encode(raw).strip()
-req.add_unredirected_header('Authorization', auth)
-return req
-
-
-class AmbariResource:
-
- def __init__(self, serviceName, componentName):
-self.serviveName = serviceName
-self.componentName = componentName
-self.isInitialized = False
-
- def initializeResource(self):
-global CLUSTER_NAME
-if CLUSTER_NAME is None:
- CLUSTER_NAME = self.findClusterName()
-
-if self.serviveName is None:
- raise Exception(&#
[2/2] ambari git commit: AMBARI-20855 Removing unused script: relocate_host_components.py (Attila Magyar via adoroszlai)
AMBARI-20855 Removing unused script: relocate_host_components.py (Attila Magyar
via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e3674352
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e3674352
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e3674352
Branch: refs/heads/branch-2.5
Commit: e3674352f1d781b8a72cf3a663f998497d41db24
Parents: ef7578f
Author: Attila Magyar
Authored: Tue May 2 17:34:26 2017 +0200
Committer: Attila Doroszlai
Committed: Tue May 2 17:35:00 2017 +0200
--
.../scripts/relocate_host_components.py | 489 ---
1 file changed, 489 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e3674352/ambari-server/src/main/resources/scripts/relocate_host_components.py
--
diff --git
a/ambari-server/src/main/resources/scripts/relocate_host_components.py
b/ambari-server/src/main/resources/scripts/relocate_host_components.py
deleted file mode 100644
index 1b9ad1e..000
--- a/ambari-server/src/main/resources/scripts/relocate_host_components.py
+++ /dev/null
@@ -1,489 +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 optparse
-import sys
-import os
-import logging
-import tempfile
-import urllib2
-import socket
-import json
-import base64
-import time
-
-AMBARI_HOSTNAME = None
-AMBARI_PORT = 8080
-CLUSTER_NAME = None
-PROTOCOL = "http"
-USERNAME = "admin"
-PASSWORD = "admin"
-DEFAULT_TIMEOUT = 10 # seconds
-START_ON_RELOCATE = False
-
-# Supported Actions
-RELOCATE_ACTION = 'relocate'
-ALLOWED_ACTUAL_STATES_FOR_RELOCATE = [ 'INIT', 'UNKNOWN', 'DISABLED',
'UNINSTALLED' ]
-ALLOWED_HOST_STATUS_FOR_RELOCATE = [ 'HEALTHY' ]
-STATUS_WAIT_TIMEOUT = 120 # seconds
-STATUS_CHECK_INTERVAL = 10 # seconds
-
-# API calls
-GET_CLUSTERS_URI = "/api/v1/clusters/"
-GET_HOST_COMPONENTS_URI = "/api/v1/clusters/{0}/services/{1}/components/{2}" +\
- "?fields=host_components"
-GET_HOST_COMPONENT_DESIRED_STATE_URI = "/api/v1/clusters/{0}/hosts/{1}" +\
- "/host_components/{2}" +\
- "?fields=HostRoles/desired_state"
-GET_HOST_COMPONENT_STATE_URI = "/api/v1/clusters/{0}/hosts/{1}" +\
- "/host_components/{2}" +\
- "?fields=HostRoles/state"
-GET_HOST_STATE_URL = "/api/v1/clusters/{0}/hosts/{1}?fields=Hosts/host_state"
-HOST_COMPONENT_URI = "/api/v1/clusters/{0}/hosts/{1}/host_components/{2}"
-ADD_HOST_COMPONENT_URI = "/api/v1/clusters/{0}/hosts?Hosts/host_name={1}"
-
-logger = logging.getLogger()
-
-
-
-class PreemptiveBasicAuthHandler(urllib2.BaseHandler):
-
- def __init__(self):
-password_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
-password_mgr.add_password(None, getUrl(''), USERNAME, PASSWORD)
-self.passwd = password_mgr
-self.add_password = self.passwd.add_password
-
- def http_request(self, req):
-uri = req.get_full_url()
-user = USERNAME
-pw = PASSWORD
-raw = "%s:%s" % (user, pw)
-auth = 'Basic %s' % base64.b64encode(raw).strip()
-req.add_unredirected_header('Authorization', auth)
-return req
-
-
-class AmbariResource:
-
- def __init__(self, serviceName, componentName):
-self.serviveName = serviceName
-self.componentName = componentName
-self.isInitialized = False
-
- def initializeResource(self):
-global CLUSTER_NAME
-if CLUSTER_NAME is None:
- CLUSTER_NAME = self.findClusterName()
-
-if self.serviveName is None:
- raise Exception('Service name undefined')
-
-if self.componentName is None:
- raise Exception('Component name undefined')
-
-
[1/2] ambari git commit: AMBARI-20886. Create idempotent Ambari DB Schema SQL script for AzureDB
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 5e4b94bbb -> 928f80908
refs/heads/trunk f942bb22e -> 35c90c996
AMBARI-20886. Create idempotent Ambari DB Schema SQL script for AzureDB
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/35c90c99
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/35c90c99
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/35c90c99
Branch: refs/heads/trunk
Commit: 35c90c996726fb1ae9fdf46f3a8da93f47914770
Parents: f942bb2
Author: Attila Doroszlai
Authored: Wed May 3 15:37:50 2017 +0200
Committer: Attila Doroszlai
Committed: Wed May 3 15:44:53 2017 +0200
--
ambari-server/pom.xml | 13
ambari-server/src/main/assemblies/server.xml| 5 ++
.../src/main/python/azuredb_create_generator.py | 81
ambari-server/src/main/resources/.gitignore | 1 +
.../src/main/sh/azuredb_create_generator.sh | 26 +++
5 files changed, 126 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/35c90c99/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index da1f09e..8635608 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -683,6 +683,19 @@
exec
+
+
+
${project.basedir}/src/main/sh/azuredb_create_generator.sh
+
+${project.basedir}
+
+
+azuredb-gen
+generate-resources
+
+ exec
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/35c90c99/ambari-server/src/main/assemblies/server.xml
--
diff --git a/ambari-server/src/main/assemblies/server.xml
b/ambari-server/src/main/assemblies/server.xml
index 51ee14e..1bda878 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -336,6 +336,11 @@
755
+ target/classes/Ambari-DDL-AzureDB-CREATE.sql
+ /var/lib/ambari-server/resources
+
+
+ 755
target/classes/Ambari-DDL-SQLServer-CREATE.sql
/var/lib/ambari-server/resources
http://git-wip-us.apache.org/repos/asf/ambari/blob/35c90c99/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
new file mode 100755
index 000..5972c56
--- /dev/null
+++ b/ambari-server/src/main/python/azuredb_create_generator.py
@@ -0,0 +1,81 @@
+#!/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.
+'''
+
+# This script transforms SQLServer "create" SQL to idempotent SQL for AzureDB.
+# It is a filter, ie. it expects input on stdin, and prints output on stdout.
+
+import fileinput
+import re
+from textwrap import dedent
+
+input_sql = "".join(fileinput.input())
+input_statements = re.split(';', input_sql)
+statements = []
+for statement in input_statements:
+ # wrap "CREATE TABLE" in IF for existence check
+ statement = re.sub(
+"CREATE TABLE ([^\s(]+).*",
+dedent('''\
+ IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id =
OBJECT_ID('dbo.\g<1>') AND type = 'U')
+ BEGIN
+ \g<0>
+ END
+ '''),
+statement,
+flags = re.DOTALL | re.IGNORECASE)
+
+ # wrap "CREATE INDEX" in IF for existence check
+ statement = re.sub("CREATE(?: NONCLUSTERED)? INDEX ([^ (]+).*",
+dedent('''\
+ IF NOT EXISTS (SELECT 1 FROM sys.indexes WHERE name = '\g<1>')
+ BEGIN
+ \g<0>
+ END
+ '''),
+statement,
+flags = re.DOTALL | re.IGNORECASE)
+
+ # wrap "ALTER TABLE ... ADD CONSTRAINT ... FOREIGN KEY" in IF for existence
check
+ statement = re.sub("ALTER TABLE \S+ ADD CONSTRAINT (\S+) FOREIGN KEY.*",
+dedent
[2/2] ambari git commit: AMBARI-20886. Create idempotent Ambari DB Schema SQL script for AzureDB
AMBARI-20886. Create idempotent Ambari DB Schema SQL script for AzureDB
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/928f8090
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/928f8090
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/928f8090
Branch: refs/heads/branch-2.5
Commit: 928f80908d36992452d06b43a77bc4ebfadef7fa
Parents: 5e4b94b
Author: Attila Doroszlai
Authored: Wed May 3 15:37:50 2017 +0200
Committer: Attila Doroszlai
Committed: Wed May 3 15:46:53 2017 +0200
--
ambari-server/pom.xml | 13
ambari-server/src/main/assemblies/server.xml| 5 ++
.../src/main/python/azuredb_create_generator.py | 81
ambari-server/src/main/resources/.gitignore | 1 +
.../src/main/sh/azuredb_create_generator.sh | 26 +++
5 files changed, 126 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/928f8090/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 7128598..231c5af 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -669,6 +669,19 @@
exec
+
+
+
${project.basedir}/src/main/sh/azuredb_create_generator.sh
+
+${project.basedir}
+
+
+azuredb-gen
+generate-resources
+
+ exec
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/928f8090/ambari-server/src/main/assemblies/server.xml
--
diff --git a/ambari-server/src/main/assemblies/server.xml
b/ambari-server/src/main/assemblies/server.xml
index a6996f0..74d96a4 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -334,6 +334,11 @@
755
+ target/classes/Ambari-DDL-AzureDB-CREATE.sql
+ /var/lib/ambari-server/resources
+
+
+ 755
target/classes/Ambari-DDL-SQLServer-CREATE.sql
/var/lib/ambari-server/resources
http://git-wip-us.apache.org/repos/asf/ambari/blob/928f8090/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
new file mode 100755
index 000..5972c56
--- /dev/null
+++ b/ambari-server/src/main/python/azuredb_create_generator.py
@@ -0,0 +1,81 @@
+#!/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.
+'''
+
+# This script transforms SQLServer "create" SQL to idempotent SQL for AzureDB.
+# It is a filter, ie. it expects input on stdin, and prints output on stdout.
+
+import fileinput
+import re
+from textwrap import dedent
+
+input_sql = "".join(fileinput.input())
+input_statements = re.split(';', input_sql)
+statements = []
+for statement in input_statements:
+ # wrap "CREATE TABLE" in IF for existence check
+ statement = re.sub(
+"CREATE TABLE ([^\s(]+).*",
+dedent('''\
+ IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id =
OBJECT_ID('dbo.\g<1>') AND type = 'U')
+ BEGIN
+ \g<0>
+ END
+ '''),
+statement,
+flags = re.DOTALL | re.IGNORECASE)
+
+ # wrap "CREATE INDEX" in IF for existence check
+ statement = re.sub("CREATE(?: NONCLUSTERED)? INDEX ([^ (]+).*",
+dedent('''\
+ IF NOT EXISTS (SELECT 1 FROM sys.indexes WHERE name = '\g<1>')
+ BEGIN
+ \g<0>
+ END
+ '''),
+statement,
+flags = re.DOTALL | re.IGNORECASE)
+
+ # wrap "ALTER TABLE ... ADD CONSTRAINT ... FOREIGN KEY" in IF for existence
check
+ statement = re.sub("ALTER TABLE \S+ ADD CONSTRAINT (\S+) FOREIGN KEY.*",
+dedent('''\
+ IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id =
OBJECT_ID('\g<1>') AND type = 'F')
+ BEGIN
+
[2/2] ambari git commit: AMBARI-20886. Create idempotent Ambari DB Schema SQL script for AzureDB - addendum for Python 2.6
AMBARI-20886. Create idempotent Ambari DB Schema SQL script for AzureDB -
addendum for Python 2.6
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/945b467c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/945b467c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/945b467c
Branch: refs/heads/branch-2.5
Commit: 945b467c871d9fa746ff23bb4bd4eebfde24c36f
Parents: 91ab3c3
Author: Attila Doroszlai
Authored: Thu May 4 08:15:28 2017 +0200
Committer: Attila Doroszlai
Committed: Thu May 4 08:23:08 2017 +0200
--
.../src/main/python/azuredb_create_generator.py | 22
1 file changed, 13 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/945b467c/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 5972c56..6ceaa90 100755
--- a/ambari-server/src/main/python/azuredb_create_generator.py
+++ b/ambari-server/src/main/python/azuredb_create_generator.py
@@ -25,43 +25,47 @@ import fileinput
import re
from textwrap import dedent
+flags = re.DOTALL | re.IGNORECASE
+create_table_re = re.compile("CREATE TABLE ([^\s(]+).*", flags = flags)
+create_index_re = re.compile("CREATE(?: NONCLUSTERED)? INDEX ([^ (]+).*",
flags = flags)
+add_fk_const_re = re.compile("ALTER TABLE \S+ ADD CONSTRAINT (\S+) FOREIGN
KEY.*", flags = flags)
+
input_sql = "".join(fileinput.input())
input_statements = re.split(';', input_sql)
statements = []
for statement in input_statements:
# wrap "CREATE TABLE" in IF for existence check
statement = re.sub(
-"CREATE TABLE ([^\s(]+).*",
+create_table_re,
dedent('''\
IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id =
OBJECT_ID('dbo.\g<1>') AND type = 'U')
BEGIN
\g<0>
END
'''),
-statement,
-flags = re.DOTALL | re.IGNORECASE)
+statement)
# wrap "CREATE INDEX" in IF for existence check
- statement = re.sub("CREATE(?: NONCLUSTERED)? INDEX ([^ (]+).*",
+ statement = re.sub(
+create_index_re,
dedent('''\
IF NOT EXISTS (SELECT 1 FROM sys.indexes WHERE name = '\g<1>')
BEGIN
\g<0>
END
'''),
-statement,
-flags = re.DOTALL | re.IGNORECASE)
+statement)
# wrap "ALTER TABLE ... ADD CONSTRAINT ... FOREIGN KEY" in IF for existence
check
- statement = re.sub("ALTER TABLE \S+ ADD CONSTRAINT (\S+) FOREIGN KEY.*",
+ statement = re.sub(
+add_fk_const_re,
dedent('''\
IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id =
OBJECT_ID('\g<1>') AND type = 'F')
BEGIN
\g<0>
END
'''),
-statement,
-flags = re.DOTALL | re.IGNORECASE)
+statement)
statements.append(statement)
[1/2] ambari git commit: AMBARI-20886. Create idempotent Ambari DB Schema SQL script for AzureDB - addendum for Python 2.6
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 91ab3c3be -> 945b467c8
refs/heads/trunk 254996365 -> fa8322994
AMBARI-20886. Create idempotent Ambari DB Schema SQL script for AzureDB -
addendum for Python 2.6
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa832299
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa832299
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa832299
Branch: refs/heads/trunk
Commit: fa8322994385081187e285e43fe36d4575743ed4
Parents: 2549963
Author: Attila Doroszlai
Authored: Thu May 4 08:15:28 2017 +0200
Committer: Attila Doroszlai
Committed: Thu May 4 08:22:47 2017 +0200
--
.../src/main/python/azuredb_create_generator.py | 22
1 file changed, 13 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fa832299/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 5972c56..6ceaa90 100755
--- a/ambari-server/src/main/python/azuredb_create_generator.py
+++ b/ambari-server/src/main/python/azuredb_create_generator.py
@@ -25,43 +25,47 @@ import fileinput
import re
from textwrap import dedent
+flags = re.DOTALL | re.IGNORECASE
+create_table_re = re.compile("CREATE TABLE ([^\s(]+).*", flags = flags)
+create_index_re = re.compile("CREATE(?: NONCLUSTERED)? INDEX ([^ (]+).*",
flags = flags)
+add_fk_const_re = re.compile("ALTER TABLE \S+ ADD CONSTRAINT (\S+) FOREIGN
KEY.*", flags = flags)
+
input_sql = "".join(fileinput.input())
input_statements = re.split(';', input_sql)
statements = []
for statement in input_statements:
# wrap "CREATE TABLE" in IF for existence check
statement = re.sub(
-"CREATE TABLE ([^\s(]+).*",
+create_table_re,
dedent('''\
IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id =
OBJECT_ID('dbo.\g<1>') AND type = 'U')
BEGIN
\g<0>
END
'''),
-statement,
-flags = re.DOTALL | re.IGNORECASE)
+statement)
# wrap "CREATE INDEX" in IF for existence check
- statement = re.sub("CREATE(?: NONCLUSTERED)? INDEX ([^ (]+).*",
+ statement = re.sub(
+create_index_re,
dedent('''\
IF NOT EXISTS (SELECT 1 FROM sys.indexes WHERE name = '\g<1>')
BEGIN
\g<0>
END
'''),
-statement,
-flags = re.DOTALL | re.IGNORECASE)
+statement)
# wrap "ALTER TABLE ... ADD CONSTRAINT ... FOREIGN KEY" in IF for existence
check
- statement = re.sub("ALTER TABLE \S+ ADD CONSTRAINT (\S+) FOREIGN KEY.*",
+ statement = re.sub(
+add_fk_const_re,
dedent('''\
IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id =
OBJECT_ID('\g<1>') AND type = 'F')
BEGIN
\g<0>
END
'''),
-statement,
-flags = re.DOTALL | re.IGNORECASE)
+statement)
statements.append(statement)
ambari git commit: AMBARI-20918. AmbariServer Metrics service cannot be disabled
Repository: ambari
Updated Branches:
refs/heads/trunk fa8322994 -> 37960b421
AMBARI-20918. AmbariServer Metrics service cannot be disabled
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37960b42
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37960b42
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37960b42
Branch: refs/heads/trunk
Commit: 37960b421d9e559f54ac1b1614e861d14f7cd389
Parents: fa83229
Author: Attila Doroszlai
Authored: Wed May 3 14:34:02 2017 +0200
Committer: Attila Doroszlai
Committed: Thu May 4 10:16:53 2017 +0200
--
.../org/apache/ambari/server/configuration/Configuration.java | 5 +
.../java/org/apache/ambari/server/controller/AmbariServer.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/37960b42/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index ff20834..114046f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -5158,6 +5158,11 @@ public class Configuration {
return Boolean.parseBoolean(getProperty(TIMELINE_METRICS_CACHE_DISABLE));
}
+ /** @see #AMBARISERVER_METRICS_DISABLE */
+ public boolean isMetricsServiceDisabled() {
+return Boolean.parseBoolean(getProperty(AMBARISERVER_METRICS_DISABLE));
+ }
+
/**
* Constant fudge factor subtracted from the cache update requests to
* account for unavailability of data on the trailing edge due to buffering.
http://git-wip-us.apache.org/repos/asf/ambari/blob/37960b42/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index bc6b428..2f799b7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -576,7 +576,7 @@ public class AmbariServer {
serviceManager.startAsync();
LOG.info("* Started Services **");
- if (!Configuration.AMBARISERVER_METRICS_DISABLE.equals(true)) {
+ if (!configs.isMetricsServiceDisabled()) {
metricsService.start();
} else {
LOG.info("AmbariServer Metrics disabled.");
ambari git commit: AMBARI-20931. Wrong equality check in ValueAttributesInfo
Repository: ambari
Updated Branches:
refs/heads/trunk 7cc5e9e22 -> 4b48b80c0
AMBARI-20931. Wrong equality check in ValueAttributesInfo
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b48b80c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b48b80c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b48b80c
Branch: refs/heads/trunk
Commit: 4b48b80c0aa47bf01dd885d08a9f3cb55d716ae9
Parents: 7cc5e9e
Author: Attila Doroszlai
Authored: Thu May 4 23:10:34 2017 +0200
Committer: Attila Doroszlai
Committed: Thu May 4 23:10:34 2017 +0200
--
.../java/org/apache/ambari/server/state/ValueAttributesInfo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b48b80c/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java
index c41cd9a..40d32d6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ValueAttributesInfo.java
@@ -306,7 +306,7 @@ public class ValueAttributesInfo {
return false;
if (overridable != null ? !overridable.equals(that.overridable) :
that.overridable != null)
return false;
-if (hidden != null ? !hidden.equals(that.overridable) : that.hidden !=
null)
+if (hidden != null ? !hidden.equals(that.hidden) : that.hidden != null)
return false;
if (showPropertyName != null ?
!showPropertyName.equals(that.showPropertyName) : that.showPropertyName != null)
return false;
ambari git commit: AMBARI-20952. Collection added to itself
Repository: ambari
Updated Branches:
refs/heads/trunk 8a6995103 -> 3dd206ccf
AMBARI-20952. Collection added to itself
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3dd206cc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3dd206cc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3dd206cc
Branch: refs/heads/trunk
Commit: 3dd206ccf4bd3dfeee128581e3641dedca86a842
Parents: 8a69951
Author: Attila Doroszlai
Authored: Mon May 8 10:39:22 2017 +0200
Committer: Attila Doroszlai
Committed: Mon May 8 20:35:35 2017 +0200
--
.../server/stack/QuickLinksConfigurationModule.java | 2 +-
.../org/apache/ambari/server/stack/ThemeModule.java | 2 +-
.../server/stack/QuickLinksConfigurationModuleTest.java | 10 ++
.../org/apache/ambari/server/stack/ThemeModuleTest.java | 12 ++--
4 files changed, 22 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3dd206cc/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
index c879c02..0f36a9a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/QuickLinksConfigurationModule.java
@@ -125,7 +125,7 @@ public class QuickLinksConfigurationModule extends
BaseModule errors) {
-errors.addAll(errors);
+this.errors.addAll(errors);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/3dd206cc/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
index 72d3bd3..d0a5f34 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ThemeModule.java
@@ -125,7 +125,7 @@ public class ThemeModule extends BaseModule implements V
@Override
public void addErrors(Collection errors) {
-errors.addAll(errors);
+this.errors.addAll(errors);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/3dd206cc/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
index f6b7dfa..142efa3 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/stack/QuickLinksConfigurationModuleTest.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.state.quicklinks.Check;
@@ -37,11 +38,20 @@ import org.apache.ambari.server.state.quicklinks.QuickLinks;
import org.apache.ambari.server.state.quicklinks.QuickLinksConfiguration;
import org.junit.Test;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
public class QuickLinksConfigurationModuleTest {
@Test
+ public void testAddErrors() {
+Set errors = ImmutableSet.of("one error", "two errors");
+QuickLinksConfigurationModule module = new
QuickLinksConfigurationModule((File) null);
+module.addErrors(errors);
+assertEquals(errors, ImmutableSet.copyOf(module.getErrors()));
+ }
+
+ @Test
public void testResolveInherit() throws Exception{
QuickLinks[] results = resolveQuickLinks("parent_quicklinks.json",
"child_quicklinks_to_inherit.json");
QuickLinks parentQuickLinks = results[0];
http://git-wip-us.apache.org/repos/asf/ambari/blob/3dd206cc/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleTest.java
index ec89a8c..e8b1b40 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/stack/ThemeModuleT
[1/2] ambari git commit: AMBARI-20951. Integrate HostService resource with Swagger
Repository: ambari
Updated Branches:
refs/heads/ambari-rest-api-explorer 4ede67151 -> 0e13b0184
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e13b018/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
index ac6ac1d..01dd8e3 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
@@ -73,6 +73,7 @@ import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.HostConfig;
import org.apache.ambari.server.state.HostHealthStatus;
import org.apache.ambari.server.state.HostHealthStatus.HealthStatus;
+import org.apache.ambari.server.state.HostState;
import org.apache.ambari.server.state.MaintenanceState;
import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.stack.OsFamily;
@@ -162,7 +163,7 @@ public class HostResourceProviderTest extends
EasyMockSupport {
// add properties to the request map
properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID,
"Cluster100");
-properties.put(HostResourceProvider.HOST_NAME_PROPERTY_ID, "Host100");
+properties.put(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID, "Host100");
propertySet.add(properties);
@@ -244,7 +245,7 @@ public class HostResourceProviderTest extends
EasyMockSupport {
Set propertyIds = new HashSet<>();
propertyIds.add(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID);
-propertyIds.add(HostResourceProvider.HOST_NAME_PROPERTY_ID);
+propertyIds.add(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_MAINTENANCE_STATE_PROPERTY_ID);
Predicate predicate = buildPredicate("Cluster100", null);
@@ -329,11 +330,8 @@ public class HostResourceProviderTest extends
EasyMockSupport {
expect(hostResponse1.getClusterName()).andReturn("").anyTimes();
expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
-expect(hostResponse1.getHealthStatus()).andReturn(healthStatus).anyTimes();
expect(hostResponse1.getStatus()).andReturn(HealthStatus.HEALTHY.name()).anyTimes();
-
-
expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes();
-expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes();
+expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes();
expect(ambariMetaInfo.getComponent((String) anyObject(), (String)
anyObject(),
@@ -348,7 +346,7 @@ public class HostResourceProviderTest extends
EasyMockSupport {
Set propertyIds = new HashSet<>();
propertyIds.add(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID);
-propertyIds.add(HostResourceProvider.HOST_NAME_PROPERTY_ID);
+propertyIds.add(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_HOST_STATUS_PROPERTY_ID);
Predicate predicate = buildPredicate("Cluster100", null);
@@ -443,7 +441,7 @@ public class HostResourceProviderTest extends
EasyMockSupport {
Set propertyIds = new HashSet<>();
propertyIds.add(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID);
-propertyIds.add(HostResourceProvider.HOST_NAME_PROPERTY_ID);
+propertyIds.add(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_HOST_STATUS_PROPERTY_ID);
Predicate predicate = buildPredicate("Cluster100", null);
@@ -483,7 +481,6 @@ public class HostResourceProviderTest extends
EasyMockSupport {
AmbariManagementController managementController =
injector.getInstance(AmbariManagementController.class);
Clusters clusters = injector.getInstance(Clusters.class);
Cluster cluster = createMock(Cluster.class);
-HostHealthStatus healthStatus = createNiceMock(HostHealthStatus.class);
AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class);
ComponentInfo componentInfo = createNiceMock(ComponentInfo.class);
HostResponse hostResponse1 = createNiceMock(HostResponse.class);
@@ -526,11 +523,8 @@ public class HostResourceProviderTest extends
EasyMockSupport {
expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes();
expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
-expect(hostResponse1.getHealthStatus()).andReturn(healthStatus).anyTimes();
expect(hostResponse1.getStatus()).andReturn(HealthStatus.UNHEALTHY.name()).anyTimes();
-
-
expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes()
[2/2] ambari git commit: AMBARI-20951. Integrate HostService resource with Swagger
AMBARI-20951. Integrate HostService resource with Swagger
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0e13b018
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0e13b018
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0e13b018
Branch: refs/heads/ambari-rest-api-explorer
Commit: 0e13b01849f1b13010a83b01861102a5febb5e7c
Parents: 4ede671
Author: Attila Doroszlai
Authored: Mon Apr 24 09:46:37 2017 +0200
Committer: Attila Doroszlai
Committed: Mon May 8 20:52:42 2017 +0200
--
.../ambari/server/api/services/BaseService.java | 26 ++
.../ambari/server/api/services/HostService.java | 188 +---
.../request/eventcreator/HostEventCreator.java | 4 +-
.../ambari/server/controller/HostRequest.java | 72 ++---
.../ambari/server/controller/HostResponse.java | 287 +--
.../controller/RootServiceResponseFactory.java | 2 +-
.../internal/HostResourceProvider.java | 188 ++--
.../controller/internal/HostStatusHelper.java | 7 +-
...ootServiceHostComponentResourceProvider.java | 2 +-
.../internal/ScaleClusterRequest.java | 10 +-
.../controller/utilities/PropertyHelper.java| 2 +-
.../ambari/server/state/host/HostImpl.java | 6 +-
.../ambari/server/topology/AmbariContext.java | 2 +-
.../ambari/server/topology/HostRequest.java | 2 +-
.../server/api/services/HostServiceTest.java| 2 +-
.../request/creator/HostEventCreatorTest.java | 4 +-
.../AmbariManagementControllerTest.java | 54 ++--
.../internal/AbstractResourceProviderTest.java | 5 +-
.../internal/HostResourceProviderTest.java | 74 ++---
...erviceHostComponentResourceProviderTest.java | 11 +-
.../internal/ScaleClusterRequestTest.java | 14 +-
.../server/topology/TopologyManagerTest.java| 4 +-
22 files changed, 434 insertions(+), 532 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e13b018/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
index 0185d37..76d2b70 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
@@ -49,6 +49,32 @@ import org.slf4j.LoggerFactory;
public abstract class BaseService {
public final static MediaType MEDIA_TYPE_TEXT_CSV_TYPE = new
MediaType("text", "csv");
+ static final String SUCCESSFUL_OPERATION = "Successful operation";
+ static final String REQUEST_ACCEPTED = "Request is accepted, but not
completely processed yet";
+ static final String INVALID_ARGUMENTS = "Invalid arguments";
+ static final String CLUSTER_NOT_FOUND = "Cluster not found";
+ static final String CLUSTER_OR_HOST_NOT_FOUND = "Cluster or host not found";
+ static final String NOT_AUTHENTICATED = "Not authenticated";
+ static final String PERMISSION_DENIED = "Not permitted to perform the
operation";
+ static final String SERVER_ERROR = "Internal server error";
+
+ static final String QUERY_FIELDS = "fields";
+ static final String QUERY_FILTER_DESCRIPTION = "Filter fields in the
response (identifier fields are mandatory)";
+ static final String QUERY_SORT = "sortBy";
+ static final String QUERY_SORT_DESCRIPTION = "Sort resources in result by
(asc | desc)";
+ static final String QUERY_PAGE_SIZE = "page_size";
+ static final String QUERY_PAGE_SIZE_DESCRIPTION = "The number of resources
to be returned for the paged response.";
+ static final String DEFAULT_PAGE_SIZE = "10";
+ static final String QUERY_FROM = "from";
+ static final String QUERY_FROM_DESCRIPTION = "The starting page resource
(inclusive). \"start\" is also accepted.";
+ static final String QUERY_FROM_TYPE = "integer";
+ static final String QUERY_FROM_VALUES = "range[0, infinity]";
+ static final String DEFAULT_FROM = "0";
+ static final String QUERY_TO = "to";
+ static final String QUERY_TO_DESCRIPTION = "The ending page resource
(inclusive). \"end\" is also accepted.";
+ static final String QUERY_TO_TYPE = "integer";
+ static final String QUERY_TO_VALUES = "range[1, infinity]";
+
/**
* Logger instance.
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e13b018/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java
b/ambari-server/src/main/java/org/apache/ambari/serv
[1/2] ambari git commit: AMBARI-20970. Integrate StackService resource with swagger (Balazs Bence Sari via adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/ambari-rest-api-explorer 0e13b0184 -> 54983ee3b
http://git-wip-us.apache.org/repos/asf/ambari/blob/54983ee3/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionLinkResponse.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionLinkResponse.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionLinkResponse.java
index 99c9ce9..c4f3941 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionLinkResponse.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ExtensionLinkResponse.java
@@ -24,80 +24,32 @@ import java.util.Set;
import org.apache.ambari.server.stack.Validable;
+import io.swagger.annotations.ApiModelProperty;
+
/**
* An extension version is like a stack version but it contains custom
services. Linking an extension
* version to the current stack version allows the cluster to install the
custom services contained in
* the extension version.
*/
-public class ExtensionLinkResponse implements Validable {
-
- private String linkId;
-
- private String stackName;
-
- private String stackVersion;
-
- private String extensionName;
-
- private String extensionVersion;
+public class ExtensionLinkResponse implements Validable, ApiModel {
+ private ExtensionLinkResponseInfo extensionLinkResponseInfo;
private boolean valid;
-
private Set errorSet = new HashSet<>();
public ExtensionLinkResponse(String linkId, String stackName, String
stackVersion, String extensionName,
- String extensionVersion, boolean valid,
Collection errorSet) {
-
-setLinkId(linkId);
-setStackName(stackName);
-setStackVersion(stackVersion);
-setExtensionName(extensionName);
-setExtensionVersion(extensionVersion);
-setValid(valid);
-addErrors(errorSet);
- }
-
- public String getLinkId() {
-return linkId;
- }
-
- public void setLinkId(String linkId) {
-this.linkId = linkId;
- }
-
- public String getStackName() {
-return stackName;
- }
-
- public void setStackName(String stackName) {
-this.stackName = stackName;
- }
-
- public String getStackVersion() {
-return stackVersion;
- }
-
- public void setStackVersion(String stackVersion) {
-this.stackVersion = stackVersion;
- }
-
- public String getExtensionName() {
-return extensionName;
+ String extensionVersion, boolean valid,
Collection errorSet) {
+extensionLinkResponseInfo = new ExtensionLinkResponseInfo(linkId,
stackName, stackVersion, extensionName,
+extensionVersion, valid, errorSet);
}
- public void setExtensionName(String extensionName) {
-this.extensionName = extensionName;
- }
-
- public String getExtensionVersion() {
-return extensionVersion;
- }
-
- public void setExtensionVersion(String extensionVersion) {
-this.extensionVersion = extensionVersion;
+ @ApiModelProperty(name = "ExtensionLink")
+ public ExtensionLinkResponseInfo getExtensionLinkResponseInfo() {
+return extensionLinkResponseInfo;
}
@Override
+ @ApiModelProperty(hidden = true)
public boolean isValid() {
return valid;
}
@@ -113,6 +65,7 @@ public class ExtensionLinkResponse implements Validable {
}
@Override
+ @ApiModelProperty(hidden = true)
public Collection getErrors() {
return errorSet;
}
@@ -121,4 +74,70 @@ public class ExtensionLinkResponse implements Validable {
public void addErrors(Collection errors) {
this.errorSet.addAll(errors);
}
+
+ public class ExtensionLinkResponseInfo {
+public ExtensionLinkResponseInfo(String linkId, String stackName, String
stackVersion, String extensionName,
+ String extensionVersion, boolean valid,
Collection errorSet) {
+
+ setLinkId(linkId);
+ setStackName(stackName);
+ setStackVersion(stackVersion);
+ setExtensionName(extensionName);
+ setExtensionVersion(extensionVersion);
+ setValid(valid);
+ addErrors(errorSet);
+}
+
+private String linkId;
+private String stackName;
+private String stackVersion;
+private String extensionName;
+private String extensionVersion;
+
+@ApiModelProperty(name = "link_id")
+public String getLinkId() {
+ return linkId;
+}
+
+public void setLinkId(String linkId) {
+ this.linkId = linkId;
+}
+
+@ApiModelProperty(name = "stack_name")
+public String getStackName() {
+ return stackName;
+}
+
+public void setStackName(String stackName) {
+ this.stackName = stackName;
+}
+
+@ApiModelProperty(name = "stack_version")
+public String getStackVersion() {
+ return stackVersion;
+}
+
+public void setStackVersion(String stackVersion) {
+ this.stackVersion = stackVersion;
+}
+
+
[2/2] ambari git commit: AMBARI-20970. Integrate StackService resource with swagger (Balazs Bence Sari via adoroszlai)
AMBARI-20970. Integrate StackService resource with swagger (Balazs Bence Sari
via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/54983ee3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54983ee3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54983ee3
Branch: refs/heads/ambari-rest-api-explorer
Commit: 54983ee3b8980e3f1e35a7859d4e759eb17fac87
Parents: 0e13b01
Author: Balazs Bence Sari
Authored: Wed May 10 17:14:08 2017 +0200
Committer: Attila Doroszlai
Committed: Wed May 10 17:14:08 2017 +0200
--
.../ambari/server/api/services/BaseService.java | 25 +-
.../ambari/server/api/services/HostService.java | 96 +--
.../server/api/services/StacksService.java | 730 ---
.../server/api/services/users/UserService.java | 2 +-
.../api/services/views/ViewInstanceService.java | 2 +-
.../controller/ComponentDependencyResponse.java | 64 ++
.../controller/ExtensionLinkResponse.java | 137 ++--
.../server/controller/QuickLinksResponse.java | 56 ++
.../controller/StackArtifactResponse.java | 52 ++
.../StackConfigurationDependencyResponse.java | 17 +
.../controller/StackConfigurationResponse.java | 26 +-
.../ambari/server/controller/StackResponse.java | 12 +
.../StackServiceArtifactResponse.java | 53 ++
.../StackServiceComponentResponse.java | 27 +
.../server/controller/StackServiceResponse.java | 31 +-
.../server/controller/StackVersionResponse.java | 59 +-
.../ambari/server/controller/ThemeResponse.java | 56 ++
.../server/controller/ViewInstanceResponse.java | 2 +-
.../state/QuickLinksConfigurationInfo.java | 8 +-
.../apache/ambari/server/state/StackInfo.java | 2 +-
.../server/state/ValueAttributesInfo.java | 87 ++-
.../ambari/server/state/ValueEntryInfo.java | 8 +-
.../server/state/theme/ConfigCondition.java | 13 +-
.../server/state/theme/ConfigPlacement.java | 25 +-
.../ambari/server/state/theme/Layout.java | 5 +
.../ambari/server/state/theme/Section.java | 22 +-
.../ambari/server/state/theme/Subsection.java | 13 +-
.../apache/ambari/server/state/theme/Tab.java | 12 +-
.../ambari/server/state/theme/TabLayout.java| 8 +-
.../apache/ambari/server/state/theme/Theme.java | 9 +-
.../server/state/theme/ThemeConfiguration.java | 10 +-
.../apache/ambari/server/state/theme/Unit.java | 7 +-
.../ambari/server/state/theme/Widget.java | 12 +-
.../ambari/server/state/theme/WidgetEntry.java | 9 +-
34 files changed, 1397 insertions(+), 300 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/54983ee3/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
index 76d2b70..0b2afd1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
@@ -49,14 +49,15 @@ import org.slf4j.LoggerFactory;
public abstract class BaseService {
public final static MediaType MEDIA_TYPE_TEXT_CSV_TYPE = new
MediaType("text", "csv");
- static final String SUCCESSFUL_OPERATION = "Successful operation";
- static final String REQUEST_ACCEPTED = "Request is accepted, but not
completely processed yet";
- static final String INVALID_ARGUMENTS = "Invalid arguments";
- static final String CLUSTER_NOT_FOUND = "Cluster not found";
- static final String CLUSTER_OR_HOST_NOT_FOUND = "Cluster or host not found";
- static final String NOT_AUTHENTICATED = "Not authenticated";
- static final String PERMISSION_DENIED = "Not permitted to perform the
operation";
- static final String SERVER_ERROR = "Internal server error";
+ static final String MSG_SUCCESSFUL_OPERATION = "Successful operation";
+ static final String MSG_REQUEST_ACCEPTED = "Request is accepted, but not
completely processed yet";
+ static final String MSG_INVALID_ARGUMENTS = "Invalid arguments";
+ static final String MSG_CLUSTER_NOT_FOUND = "Cluster not found";
+ static final String MSG_CLUSTER_OR_HOST_NOT_FOUND = "Cluster or host not
found";
+ static final String MSG_NOT_AUTHENTICATED = "Not authenticated";
+ static final String MSG_PERMISSION_DENIED = "Not permitted to perform the
operation";
+ static final String MSG_SERVER_ERROR = "Internal server error";
+ stat
[2/2] ambari git commit: AMBARI-21009. Integrate ActionService resource with Swagger (Balazs Bence Sari via adoroszlai)
AMBARI-21009. Integrate ActionService resource with Swagger (Balazs Bence Sari
via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/580067f9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/580067f9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/580067f9
Branch: refs/heads/ambari-rest-api-explorer
Commit: 580067f9965060a80ed99fb9f803ff5aae504fc0
Parents: fea1aae
Author: Balazs Bence Sari
Authored: Tue May 16 09:11:01 2017 +0200
Committer: Attila Doroszlai
Committed: Tue May 16 09:11:01 2017 +0200
--
.../server/api/services/ActionService.java | 98 ++--
.../ambari/server/api/services/BaseService.java | 1 +
.../ambari/server/controller/ActionRequest.java | 19
.../server/controller/ActionRequestSwagger.java | 31 +++
.../server/controller/ActionResponse.java | 20 +++-
5 files changed, 159 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/580067f9/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
index 0290151..cd74867 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
@@ -29,19 +29,32 @@ 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.api.resources.ResourceInstance;
+import org.apache.ambari.server.controller.ActionResponse;
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.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
/**
* Service responsible for action definition resource requests.
*/
@Path("/actions/")
+@Api(value = "Actions", description = "Endpoint for action definition specific
operations")
public class ActionService extends BaseService {
+ private static final String ACTION_REQUEST_TYPE =
"org.apache.ambari.server.controller.ActionRequestSwagger";
+
/**
* Handles: GET /actions/{actionName}
* Get a specific action definition.
@@ -53,9 +66,23 @@ public class ActionService extends BaseService {
*/
@GET
@Path("{actionName}")
- @Produces("text/plain")
+ @Produces(MediaType.TEXT_PLAIN)
+ @ApiOperation(value = "Get the details of an action definition",
+ nickname = "ActionService#getActionDefinition",
+ response = ActionResponse.ActionResponseSwagger.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = QUERY_FIELDS, value = QUERY_FILTER_DESCRIPTION,
+ defaultValue = "Actions/*",
+ dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY)
+ })
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.SC_OK, message =
MSG_SUCCESSFUL_OPERATION),
+ @ApiResponse(code = HttpStatus.SC_UNAUTHORIZED, message =
MSG_NOT_AUTHENTICATED),
+ @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message =
MSG_RESOURCE_NOT_FOUND),
+ @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message =
MSG_SERVER_ERROR)
+ })
public Response getActionDefinition(String body, @Context HttpHeaders
headers, @Context UriInfo ui,
- @PathParam("actionName") String actionName) {
+ @ApiParam(required = true)
@PathParam("actionName") String actionName) {
return handleRequest(headers, body, ui, Request.Type.GET,
createActionDefinitionResource(actionName));
}
@@ -69,7 +96,27 @@ public class ActionService extends BaseService {
* @return action definition collection resource representation
*/
@GET
- @Produces("text/plain")
+ @Produces(MediaType.TEXT_PLAIN)
+ @ApiOperation(value = "Get all action definitions",
+ nickname = "ActionService#getActionDefinitions",
+ response = ActionResponse.ActionResponseSwagger.class,
+ responseContainer = RESPONSE_CONTAINER_LIST)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = QUERY_FIELDS, value = QUE
[1/2] ambari git commit: AMBARI-20995. Integrate ServiceService resource with Swagger (Balazs Bence Sari via adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/ambari-rest-api-explorer 54983ee3b -> 580067f99
AMBARI-20995. Integrate ServiceService resource with Swagger (Balazs Bence Sari
via adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fea1aaec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fea1aaec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fea1aaec
Branch: refs/heads/ambari-rest-api-explorer
Commit: fea1aaec8a5ff5b6c2fae8cf38f9ca3b789e1ab9
Parents: 54983ee
Author: Balazs Bence Sari
Authored: Tue May 16 09:09:07 2017 +0200
Committer: Attila Doroszlai
Committed: Tue May 16 09:09:07 2017 +0200
--
.../ambari/server/api/services/BaseService.java | 3 +
.../server/api/services/ServiceService.java | 291 +--
.../ClusterServiceArtifactRequest.java | 26 ++
.../ClusterServiceArtifactResponse.java | 49
.../server/controller/ServiceRequest.java | 8 +
.../controller/ServiceRequestSwagger.java | 31 ++
.../server/controller/ServiceResponse.java | 19 +-
7 files changed, 394 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fea1aaec/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
index 0b2afd1..964fb59 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
@@ -57,6 +57,7 @@ public abstract class BaseService {
static final String MSG_NOT_AUTHENTICATED = "Not authenticated";
static final String MSG_PERMISSION_DENIED = "Not permitted to perform the
operation";
static final String MSG_SERVER_ERROR = "Internal server error";
+ static final String MSG_RESOURCE_ALREADY_EXISTS = "The requested resource
already exists.";
static final String MSG_RESOURCE_NOT_FOUND = "The requested resource doesn't
exist.";
static final String QUERY_FIELDS = "fields";
@@ -81,6 +82,8 @@ public abstract class BaseService {
static final String DATA_TYPE_STRING = "string";
static final String PARAM_TYPE_QUERY = "query";
+ static final String PARAM_TYPE_BODY = "body";
+
/**
* Logger instance.
http://git-wip-us.apache.org/repos/asf/ambari/blob/fea1aaec/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
index 52871f2..27de0b4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
@@ -30,16 +30,32 @@ 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.api.resources.ResourceInstance;
+import org.apache.ambari.server.controller.ClusterServiceArtifactResponse;
+import org.apache.ambari.server.controller.ServiceResponse;
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.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
/**
* Service responsible for services resource requests.
*/
+@Api(value = "Services", description = "Endpoint for service specific
operations")
public class ServiceService extends BaseService {
+ private static final String SERVICE_REQUEST_TYPE =
"org.apache.ambari.server.controller.ServiceRequestSwagger";
+ private static final String ARTIFACT_REQUEST_TYPE =
"org.apache.ambari.server.controller.ClusterServiceArtifactRequest";
+
/**
* Parent cluster name.
*/
@@ -65,9 +81,23 @@ public class ServiceService extends BaseService {
*/
@GET
@Path("{serviceName}")
- @Produces("text/plain")
+ @Produces(MediaTyp
ambari git commit: AMBARI-20994. Integrate RootServiceService with Swagger (adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/ambari-rest-api-explorer 580067f99 -> 228b92897
AMBARI-20994. Integrate RootServiceService with Swagger (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/228b9289
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/228b9289
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/228b9289
Branch: refs/heads/ambari-rest-api-explorer
Commit: 228b9289755c33342586d8cbe209b5341d7380d0
Parents: 580067f
Author: Attila Doroszlai
Authored: Tue May 16 11:02:06 2017 +0200
Committer: Attila Doroszlai
Committed: Tue May 16 11:02:06 2017 +0200
--
.../ambari/server/api/services/BaseService.java | 2 +
.../server/api/services/RootServiceService.java | 363 ++-
.../AmbariManagementControllerImpl.java | 5 -
.../RootServiceComponentResponse.java | 56 ++-
.../RootServiceHostComponentResponse.java | 72 ++--
.../server/controller/RootServiceResponse.java | 24 +-
.../controller/RootServiceResponseFactory.java | 30 +-
.../internal/HostResourceProvider.java | 8 +-
.../RootServiceComponentResourceProvider.java | 63 ++--
...ootServiceHostComponentResourceProvider.java | 70 ++--
.../internal/RootServiceResourceProvider.java | 20 +-
.../api/services/RootServiceServiceTest.java| 11 +-
.../RootServiceResponseFactoryTest.java | 9 +-
...ootServiceComponentResourceProviderTest.java | 21 +-
14 files changed, 456 insertions(+), 298 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/228b9289/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
index 2808911..5f6474c 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
@@ -86,6 +86,8 @@ public abstract class BaseService {
static final String PARAM_TYPE_BODY = "body";
+ static final String FIELDS_SEPARATOR = ", ";
+
/**
* Logger instance.
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/228b9289/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java
index ce9240c..5afb7dc 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -20,6 +20,7 @@ package org.apache.ambari.server.api.services;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.ws.rs.GET;
@@ -28,137 +29,325 @@ 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.api.resources.ResourceInstance;
+import org.apache.ambari.server.controller.ApiModel;
+import org.apache.ambari.server.controller.HostResponse;
+import org.apache.ambari.server.controller.RootServiceComponentResponse;
+import org.apache.ambari.server.controller.RootServiceHostComponentResponse;
+import org.apache.ambari.server.controller.RootServiceResponse;
+import org.apache.ambari.server.controller.internal.HostResourceProvider;
+import
org.apache.ambari.server.controller.internal.RootServiceComponentResourceProvider;
+import
org.apache.ambari.server.controller.internal.RootServiceHostComponentResourceProvider;
+import
org.apache.ambari.server.controller.internal.RootServiceResourceProvider;
import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.http.HttpStatus;
-@Path("/services/")
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.
[2/2] ambari git commit: AMBARI-21035. Integrate ClusterService with Swagger (adoroszlai)
AMBARI-21035. Integrate ClusterService with Swagger (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/275525b2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/275525b2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/275525b2
Branch: refs/heads/ambari-rest-api-explorer
Commit: 275525b212d8f9ae306d83417b8f94d035a67474
Parents: 228b928
Author: Attila Doroszlai
Authored: Tue May 16 11:14:24 2017 +0200
Committer: Attila Doroszlai
Committed: Wed May 17 10:17:12 2017 +0200
--
.../server/api/services/ClusterService.java | 305 ++-
.../ambari/server/api/services/HostService.java | 22 +-
.../server/api/services/ServiceService.java | 18 +-
.../AmbariManagementControllerImpl.java | 2 +-
.../controller/ClusterArtifactRequest.java | 46 +++
.../controller/ClusterArtifactResponse.java | 49 +++
.../server/controller/ClusterRequest.java | 111 ++-
.../server/controller/ClusterResponse.java | 106 +++
.../ClusterServiceArtifactRequest.java | 34 ++-
.../ClusterServiceArtifactResponse.java | 27 +-
.../internal/ArtifactResourceProvider.java | 33 +-
.../internal/ClusterResourceProvider.java | 90 +++---
.../internal/ProvisionClusterRequest.java | 4 +-
.../server/api/services/ClusterServiceTest.java | 30 +-
.../AmbariManagementControllerTest.java | 80 ++---
.../server/controller/ClusterRequestTest.java | 16 -
.../server/controller/ClusterResponseTest.java | 11 +-
.../internal/ClusterResourceProviderTest.java | 20 +-
.../internal/ProvisionClusterRequestTest.java | 6 +-
.../server/state/cluster/ClusterTest.java | 6 +-
20 files changed, 591 insertions(+), 425 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/275525b2/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
index 5577633..80fcd2e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -31,21 +31,37 @@ 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.api.resources.ResourceInstance;
import org.apache.ambari.server.controller.AmbariServer;
+import org.apache.ambari.server.controller.ClusterArtifactResponse;
+import
org.apache.ambari.server.controller.ClusterResponse.ClusterResponseWrapper;
+import org.apache.ambari.server.controller.internal.ClusterResourceProvider;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.state.Clusters;
+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.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
/**
* Service responsible for cluster resource requests.
*/
-@Path("/clusters/")
+@Path("/clusters")
+@Api(value = "/clusters", description = "Endpoint for cluster-specific
operations")
public class ClusterService extends BaseService {
+ private static final String CLUSTER_REQUEST_TYPE =
"org.apache.ambari.server.controller.ClusterRequest";
+ private static final String ARTIFACT_REQUEST_TYPE =
"org.apache.ambari.server.controller.ClusterArtifactRequest";
+
/**
* The clusters utilities.
*/
@@ -85,10 +101,24 @@ public class ClusterService extends BaseService {
*/
@GET
@Path("{clusterName}")
- @Produces("text/plain")
+ @Produces(MediaType.TEXT_PLAIN)
+ @ApiOperation(value = "Returns information about a specific cluster",
response = ClusterResponseWrapper.class)
+ @ApiImplicitParams({
+@ApiImplicitParam(name = QUERY_FIELDS, value = QUERY_FILTER_DESCRIPTION,
dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY,
+ defaultValue = ClusterResourceProvider.AL
[1/2] ambari git commit: AMBARI-21035. Integrate ClusterService with Swagger (adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/ambari-rest-api-explorer 228b92897 -> 275525b21
http://git-wip-us.apache.org/repos/asf/ambari/blob/275525b2/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index d613a2e..7e4c4c2 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -636,45 +636,29 @@ public class AmbariManagementControllerTest {
// TODO implement after configs integration
}
- @Test
- public void testCreateClusterWithInvalidRequest() {
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateClusterWithInvalidRequest1() throws Exception {
ClusterRequest r = new ClusterRequest(null, null, null, null);
-r.toString();
-
-try {
- controller.createCluster(r);
- fail("Expected create cluster for invalid request");
-} catch (Exception e) {
- // Expected
-}
-
-r.setClusterId(1L);
-try {
- controller.createCluster(r);
- fail("Expected create cluster for invalid request");
-} catch (Exception e) {
- // Expected
-}
-r.setClusterId(null);
+controller.createCluster(r);
+ }
-r.setClusterName(getUniqueName());
-try {
- controller.createCluster(r);
- fail("Expected create cluster for invalid request - no stack version");
-} catch (Exception e) {
- // Expected
-}
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateClusterWithInvalidRequest2() throws Exception {
+ClusterRequest r = new ClusterRequest(1L, null, null, null);
+controller.createCluster(r);
+ }
-r.setStackVersion("HDP-1.2.0");
-r.setProvisioningState(State.INSTALLING.name());
-try {
- controller.createCluster(r);
- controller.updateClusters(Collections.singleton(r), null);
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateClusterWithInvalidRequest3() throws Exception {
+ClusterRequest r = new ClusterRequest(null, getUniqueName(), null, null);
+controller.createCluster(r);
+ }
- fail("Expected create cluster for invalid request - invalid provisioning
state");
-} catch (Exception e) {
- // Expected
-}
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateClusterWithInvalidRequest4() throws Exception {
+ClusterRequest r = new ClusterRequest(null, null, State.INSTALLING.name(),
null, "HDP-1.2.0", null);
+controller.createCluster(r);
+controller.updateClusters(Collections.singleton(r), null);
}
@Test
@@ -2219,7 +2203,7 @@ public class AmbariManagementControllerTest {
boolean found = false;
for (ClusterResponse cr : resp) {
if (cr.getClusterName().equals(cluster1)) {
-Assert.assertEquals(c1.getClusterId(), cr.getClusterId().longValue());
+Assert.assertEquals(c1.getClusterId(), cr.getClusterId());
Assert.assertEquals(c1.getDesiredStackVersion().getStackId(),
cr.getDesiredStackVersion());
found = true;
break;
@@ -2241,19 +2225,15 @@ public class AmbariManagementControllerTest {
clusters.addCluster(cluster3, new StackId("HDP-1.2.0"));
clusters.addCluster(cluster4, new StackId("HDP-0.1"));
-Cluster c1 = clusters.getCluster(cluster1);
-Cluster c2 = clusters.getCluster(cluster2);
-Cluster c3 = clusters.getCluster(cluster3);
-Cluster c4 = clusters.getCluster(cluster4);
-
ClusterRequest r = new ClusterRequest(null, null, null, null);
Set resp =
controller.getClusters(Collections.singleton(r));
+Assert.assertTrue(resp.size() >= 4);
r = new ClusterRequest(null, cluster1, null, null);
resp = controller.getClusters(Collections.singleton(r));
Assert.assertEquals(1, resp.size());
-Assert.assertEquals(c1.getClusterId(),
-resp.iterator().next().getClusterId().longValue());
+Cluster c1 = clusters.getCluster(cluster1);
+Assert.assertEquals(c1.getClusterId(),
resp.iterator().next().getClusterId());
r = new ClusterRequest(null, null, "HDP-0.1", null);
resp = controller.getClusters(Collections.singleton(r));
@@ -9297,13 +9277,13 @@ public class AmbariManagementControllerTest {
ClusterRequest cr = new ClusterRequest(null, CLUSTER_NAME, STACK_ID, null);
amc.createCluster(cr);
-Long CLUSTER_ID = clusters.ge
[1/2] ambari git commit: AMBARI-20951. Integrate HostService with Swagger, addendum (adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/ambari-rest-api-explorer 275525b21 -> 9763993c7
AMBARI-20951. Integrate HostService with Swagger, addendum (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/950298bc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/950298bc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/950298bc
Branch: refs/heads/ambari-rest-api-explorer
Commit: 950298bcd67114c6b4f0f81e2b6aea2155b358e8
Parents: 275525b
Author: Attila Doroszlai
Authored: Wed May 17 15:14:59 2017 +0200
Committer: Attila Doroszlai
Committed: Wed May 17 15:14:59 2017 +0200
--
.../src/main/java/org/apache/ambari/server/state/host/HostImpl.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/950298bc/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
index 4624ea8..c774fc1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
@@ -938,6 +938,7 @@ public class HostImpl implements Host {
public HostResponse convertToResponse() {
HostResponse r = new HostResponse(getHostName());
+r.setAgentVersion(getAgentVersion());
r.setPhCpuCount(getPhCpuCount());
r.setCpuCount(getCpuCount());
r.setDisksInfo(getDisksInfo());
[2/2] ambari git commit: AMBARI-20994. Integrate RootServiceService with Swagger, addendum (adoroszlai)
AMBARI-20994. Integrate RootServiceService with Swagger, addendum (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9763993c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9763993c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9763993c
Branch: refs/heads/ambari-rest-api-explorer
Commit: 9763993c75e4b50aeb82da24657c082f8bc01922
Parents: 950298b
Author: Attila Doroszlai
Authored: Wed May 17 16:13:18 2017 +0200
Committer: Attila Doroszlai
Committed: Wed May 17 19:27:16 2017 +0200
--
.../ambari/server/controller/RootServiceResponseFactory.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9763993c/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
index 714fbed..294bcc9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
@@ -199,9 +199,8 @@ public class RootServiceResponseFactory extends
Set response = new HashSet<>();
String serviceName = request.getServiceName();
-String componentName = request.getComponentName();
Set rootServiceComponents =
-getRootServiceComponents(new RootServiceComponentRequest(serviceName,
componentName));
+getRootServiceComponents(new RootServiceComponentRequest(serviceName,
request.getComponentName()));
//Cartesian product with hosts and components
for (RootServiceComponentResponse component : rootServiceComponents) {
@@ -226,8 +225,8 @@ public class RootServiceResponseFactory extends
} else {
state = host.getHostState().toString();
}
-String componentVersion = getComponentVersion(componentName, host);
-response.add(new RootServiceHostComponentResponse(serviceName,
host.getHostname(), componentName, state, componentVersion,
component.getProperties()));
+String componentVersion =
getComponentVersion(component.getComponentName(), host);
+response.add(new RootServiceHostComponentResponse(serviceName,
host.getHostname(), component.getComponentName(), state, componentVersion,
component.getProperties()));
}
}
ambari git commit: AMBARI-21026. Integrate BlueprintService with Swagger (Balazs Bence Sari via adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/ambari-rest-api-explorer 9763993c7 -> f67879461
AMBARI-21026. Integrate BlueprintService with Swagger (Balazs Bence Sari via
adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f6787946
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f6787946
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f6787946
Branch: refs/heads/ambari-rest-api-explorer
Commit: f678794617f6e221bd63b8abd9b1c54618680831
Parents: 9763993
Author: Balazs Bence Sari
Authored: Thu May 18 11:42:38 2017 +0200
Committer: Attila Doroszlai
Committed: Thu May 18 11:42:38 2017 +0200
--
.../ambari/server/api/services/BaseService.java | 4 +-
.../server/api/services/BlueprintService.java | 105 +--
.../server/controller/BlueprintSwagger.java | 91
3 files changed, 188 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f6787946/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
index 5f6474c..ce668ee 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
@@ -76,6 +76,9 @@ public abstract class BaseService {
static final String QUERY_TO_DESCRIPTION = "The ending page resource
(inclusive). \"end\" is also accepted.";
static final String QUERY_TO_TYPE = "integer";
static final String QUERY_TO_VALUES = "range[1, infinity]";
+ static final String QUERY_PREDICATE = "{predicate}";
+ static final String QUERY_PREDICATE_DESCRIPTION = "The predicate to filter
resources by. Omitting the predicate will " +
+ "match all resources.";
static final String RESPONSE_CONTAINER_LIST = "List";
@@ -85,7 +88,6 @@ public abstract class BaseService {
static final String PARAM_TYPE_QUERY = "query";
static final String PARAM_TYPE_BODY = "body";
-
static final String FIELDS_SEPARATOR = ", ";
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/f6787946/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java
index 8159ea4..b23752f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java
@@ -28,11 +28,22 @@ 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.api.resources.ResourceInstance;
+import org.apache.ambari.server.controller.BlueprintSwagger;
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.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
/**
* Service responsible for handling REST requests for the /blueprints endpoint.
@@ -41,8 +52,10 @@ import org.apache.ambari.server.controller.spi.Resource;
* immutable.
*/
@Path("/blueprints/")
+@Api(value = "Blueprints", description = "Endpoint for blueprint specific
operations")
public class BlueprintService extends BaseService {
+ public static final String BLUEPRINT_REQUEST_TYPE =
"org.apache.ambari.server.controller.BlueprintSwagger";
/**
* Handles: GET /blueprints
* Get all blueprints.
@@ -52,7 +65,27 @@ public class BlueprintService extends BaseService {
* @return blueprint collection resource representation
*/
@GET
- @Produces("text/plain")
+ @Produces(MediaType.TEXT_PLAIN)
+ @ApiOperation(value = "Get all blueprints",
+ nickname = "BlueprintService#getBlueprints",
+ response = BlueprintSwagger.class,
+ responseContainer
[2/2] ambari git commit: AMBARI-21063. Integrate RequestService with Swagger (Balazs Bence Sari via adoroszlai)
AMBARI-21063. Integrate RequestService with Swagger (Balazs Bence Sari via
adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/01772631
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/01772631
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/01772631
Branch: refs/heads/ambari-rest-api-explorer
Commit: 017726319c77c4bc6cae86f1f1e42b1b6d4f1ce0
Parents: f2cad77
Author: Balazs Bence Sari
Authored: Tue May 23 10:58:03 2017 +0200
Committer: Attila Doroszlai
Committed: Tue May 23 10:58:03 2017 +0200
--
.../server/api/services/RequestService.java | 105 +--
.../server/controller/RequestPostRequest.java | 96 +
.../server/controller/RequestPostResponse.java | 43
.../server/controller/RequestPutRequest.java| 33 ++
.../server/controller/RequestRequest.java | 6 ++
.../server/controller/RequestResponse.java | 100 ++
.../internal/RequestResourceFilter.java | 3 +-
.../internal/RequestResourceProvider.java | 66 ++--
8 files changed, 409 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/01772631/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
index 936b857..3532695 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
@@ -30,18 +30,35 @@ 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.api.resources.ResourceInstance;
+import org.apache.ambari.server.controller.RequestPostResponse;
+import org.apache.ambari.server.controller.RequestResponse;
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.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
/**
* Service responsible for request resource requests.
*/
@Path("/requests/")
+@Api(value = "Requests", description = "Endpoint for request specific
operations")
public class RequestService extends BaseService {
+
+ private static final String REQUEST_POST_REQUEST_TYPE =
"org.apache.ambari.server.controller.RequestPostRequest";
+ private static final String REQUEST_PUT_REQUEST_TYPE =
"org.apache.ambari.server.controller.RequestPutRequest";
+
/**
* Parent cluster name.
*/
@@ -73,9 +90,23 @@ public class RequestService extends BaseService {
*/
@GET
@Path("{requestId}")
- @Produces("text/plain")
+ @Produces(MediaType.TEXT_PLAIN)
+ @ApiOperation(value = "Get the details of a request",
+ nickname = "RequestService#getRequest",
+ response = RequestResponse.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = QUERY_FIELDS, value = QUERY_FILTER_DESCRIPTION,
+ defaultValue = "Requests/*",
+ dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY)
+ })
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.SC_OK, message =
MSG_SUCCESSFUL_OPERATION),
+ @ApiResponse(code = HttpStatus.SC_UNAUTHORIZED, message =
MSG_NOT_AUTHENTICATED),
+ @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message =
MSG_RESOURCE_NOT_FOUND),
+ @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message =
MSG_SERVER_ERROR)
+ })
public Response getRequest(String body, @Context HttpHeaders headers,
@Context UriInfo ui,
- @PathParam("requestId") String requestId) {
+ @ApiParam @PathParam("requestId") String
requestId) {
return handleRequest(headers, body, ui, Request.Type.GET,
createRequestResource(m_clusterName, requestId));
@@ -91,7 +122,27 @@ public class RequestService extends BaseService {
* @return request collection resource representation
*/
@GET
- @Produces("text/plain")
+ @Produces(MediaType.TEXT_PLAIN)
+ @ApiOperation(value = "Get all requests.
[1/2] ambari git commit: AMBARI-21035. Integrate ClusterService with Swagger, addendum (adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/ambari-rest-api-explorer f67879461 -> 017726319
AMBARI-21035. Integrate ClusterService with Swagger, addendum (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f2cad775
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f2cad775
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f2cad775
Branch: refs/heads/ambari-rest-api-explorer
Commit: f2cad775e98e6478fcc4282a8eff1014cc00414d
Parents: f678794
Author: Attila Doroszlai
Authored: Tue May 23 10:55:13 2017 +0200
Committer: Attila Doroszlai
Committed: Tue May 23 10:55:13 2017 +0200
--
.../api/services/ClusterRequestSwagger.java | 30 ++
.../server/api/services/ClusterService.java | 2 +-
.../server/state/ClusterHealthReport.java | 43 +++-
3 files changed, 64 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f2cad775/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterRequestSwagger.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterRequestSwagger.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterRequestSwagger.java
new file mode 100644
index 000..693a462
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterRequestSwagger.java
@@ -0,0 +1,30 @@
+/*
+ * 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.api.services;
+
+import org.apache.ambari.server.controller.ApiModel;
+import org.apache.ambari.server.controller.ClusterRequest;
+import org.apache.ambari.server.controller.internal.ClusterResourceProvider;
+
+import io.swagger.annotations.ApiModelProperty;
+
+@SuppressWarnings("unused") // for Swagger
+public interface ClusterRequestSwagger extends ApiModel {
+ @ApiModelProperty(name = ClusterResourceProvider.RESPONSE_KEY)
+ ClusterRequest getClusterRequest();
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f2cad775/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
index 80fcd2e..f61fb2a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
@@ -59,7 +59,7 @@ import io.swagger.annotations.ApiResponses;
@Api(value = "/clusters", description = "Endpoint for cluster-specific
operations")
public class ClusterService extends BaseService {
- private static final String CLUSTER_REQUEST_TYPE =
"org.apache.ambari.server.controller.ClusterRequest";
+ private static final String CLUSTER_REQUEST_TYPE =
"org.apache.ambari.server.api.services.ClusterRequestSwagger";
private static final String ARTIFACT_REQUEST_TYPE =
"org.apache.ambari.server.controller.ClusterArtifactRequest";
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/f2cad775/ambari-server/src/main/java/org/apache/ambari/server/state/ClusterHealthReport.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ClusterHealthReport.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ClusterHealthReport.java
index 4be44c6..90dac00 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ClusterHealthReport.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ClusterHealthReport.java
@@ -20,11 +20,24 @@ package org.apache.ambari.server.state;
import org.codehaus.jackson.annotate.
ambari git commit: AMBARI-21029. Integrate SettingService with Swagger (adoroszlai)
Repository: ambari
Updated Branches:
refs/heads/ambari-rest-api-explorer 017726319 -> 51fc3cf77
AMBARI-21029. Integrate SettingService with Swagger (adoroszlai)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/51fc3cf7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/51fc3cf7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/51fc3cf7
Branch: refs/heads/ambari-rest-api-explorer
Commit: 51fc3cf77302c7bc04ffb9fdbd53f053b053514f
Parents: 0177263
Author: Attila Doroszlai
Authored: Tue May 23 11:35:31 2017 +0200
Committer: Attila Doroszlai
Committed: Tue May 23 11:35:31 2017 +0200
--
.../api/services/SettingRequestSwagger.java | 30 +
.../server/api/services/SettingService.java | 126 ---
.../server/controller/SettingRequest.java | 69 ++
.../server/controller/SettingResponse.java | 90 +
.../internal/SettingResourceProvider.java | 64 ++
.../server/api/services/SettingServiceTest.java | 2 +-
6 files changed, 337 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/51fc3cf7/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingRequestSwagger.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingRequestSwagger.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingRequestSwagger.java
new file mode 100644
index 000..4e854a4
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingRequestSwagger.java
@@ -0,0 +1,30 @@
+/*
+ * 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.api.services;
+
+import org.apache.ambari.server.controller.ApiModel;
+import org.apache.ambari.server.controller.SettingRequest;
+import org.apache.ambari.server.controller.internal.SettingResourceProvider;
+
+import io.swagger.annotations.ApiModelProperty;
+
+@SuppressWarnings("unused") // for Swagger
+public interface SettingRequestSwagger extends ApiModel {
+ @ApiModelProperty(name = SettingResourceProvider.RESPONSE_KEY)
+ SettingRequest getSettingRequest();
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/51fc3cf7/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java
index e186be2..b8da678 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -29,18 +29,35 @@ 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.api.resources.ResourceInstance;
+import
org.apache.ambari.server.controller.SettingResponse.SettingResponseWrapper;
+import org.apache.ambari.server.controller.internal.SettingResourceProvider;
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.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
/**
* Service responsi
[06/50] [abbrv] ambari git commit: AMBARI-21046. UI: Upgrades should be started using repo_version_ids instead of version strings (alexantonenko)
AMBARI-21046. UI: Upgrades should be started using repo_version_ids instead of
version strings (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1568f800
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1568f800
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1568f800
Branch: refs/heads/ambari-rest-api-explorer
Commit: 1568f800764a6b20f2f09330f112070ebc0f7f86
Parents: 041d353
Author: Alex Antonenko
Authored: Wed May 17 19:24:44 2017 +0300
Committer: Alex Antonenko
Committed: Wed May 17 19:56:45 2017 +0300
--
.../controllers/main/admin/stack_and_upgrade_controller.js| 7 +--
ambari-web/app/utils/ajax/ajax.js | 4 ++--
.../main/admin/stack_and_upgrade_controller_test.js | 6 ++
3 files changed, 13 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1568f800/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 0f2efb0..d444b2d 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
@@ -414,7 +414,8 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
if (currentVersion) {
this.set('currentVersion', {
repository_version:
currentVersion.get('repositoryVersion.repositoryVersion'),
-repository_name: currentVersion.get('repositoryVersion.displayName')
+repository_name: currentVersion.get('repositoryVersion.displayName'),
+id: currentVersion.get('repositoryVersion.id')
});
}
},
@@ -736,6 +737,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
from: App.RepositoryVersion.find().findProperty('displayName',
this.get('upgradeVersion')).get('repositoryVersion'),
value: currentVersion.repository_version,
label: currentVersion.repository_name,
+id: currentVersion.id,
isDowngrade: true,
upgradeType: this.get('upgradeType')
},
@@ -1379,7 +1381,8 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
label: version.get('displayName'),
type: version.get('upgradeType'),
skipComponentFailures: version.get('skipComponentFailures') ? 'true' :
'false',
- skipSCFailures: version.get('skipSCFailures') ? 'true' : 'false'
+ skipSCFailures: version.get('skipSCFailures') ? 'true' : 'false',
+ id: version.get('id')
};
if (App.get('supports.preUpgradeCheck')) {
this.set('requestInProgress', true);
http://git-wip-us.apache.org/repos/asf/ambari/blob/1568f800/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index d9eeaa6..0b584d8 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1712,7 +1712,7 @@ var urls = {
timeout : 60,
data: JSON.stringify({
"Upgrade": {
-"repository_version": data.value,
+"repository_version_id": data.id,
"upgrade_type": data.type,
"skip_failures": data.skipComponentFailures,
"skip_service_check_failures": data.skipSCFailures,
@@ -1731,7 +1731,7 @@ var urls = {
data: JSON.stringify({
"Upgrade": {
"from_version": data.from,
-"repository_version": data.value,
+"repository_version_id": data.id,
"upgrade_type": data.upgradeType,
"direction": "DOWNGRADE"
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1568f800/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 e696bb1..fa0a0b9 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
@@ -128,6 +128,7 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
sinon.stub(App.StackVersion, 'find').returns([Em.Object.create({
state: 'CURRENT',
repositoryVersion: {
+ id: '1',
repositoryVersion: '2.2',
displayName: 'HDP-2.2'
[35/50] [abbrv] ambari git commit: AMBARI-21033 Log Search use POJOs for input configuration (mgergely)
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFile.java
--
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFile.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFile.java
new file mode 100644
index 000..5c547ad
--- /dev/null
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFile.java
@@ -0,0 +1,31 @@
+/*
+ * 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.model.common;
+
+import
org.apache.ambari.logsearch.config.api.model.inputconfig.InputDescriptor;
+
+import io.swagger.annotations.ApiModel;
+
+@ApiModel
+public class LSServerInputFile extends LSServerInputFileBase {
+ public LSServerInputFile(InputDescriptor inputDescriptor) {
+super(inputDescriptor);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd4a7a46/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFileBase.java
--
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFileBase.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFileBase.java
new file mode 100644
index 000..df21d0d
--- /dev/null
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputFileBase.java
@@ -0,0 +1,72 @@
+/*
+ * 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.model.common;
+
+import
org.apache.ambari.logsearch.config.api.model.inputconfig.InputDescriptor;
+import
org.apache.ambari.logsearch.config.api.model.inputconfig.InputFileBaseDescriptor;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import io.swagger.annotations.ApiModel;
+
+@ApiModel
+public abstract class LSServerInputFileBase extends LSServerInput {
+ @JsonProperty("checkpoint_interval_ms")
+ private Integer checkpointIntervalMs;
+
+ @JsonProperty("process_file")
+ private Boolean processFile;
+
+ @JsonProperty("copy_file")
+ private Boolean copyFile;
+
+ public LSServerInputFileBase(InputDescriptor inputDescriptor) {
+super(inputDescriptor);
+
+InputFileBaseDescriptor inputFileBaseDescriptor =
(InputFileBaseDescriptor)inputDescriptor;
+this.checkpointIntervalMs =
inputFileBaseDescriptor.getCheckpointIntervalMs();
+this.processFile = inputFileBaseDescriptor.getProcessFile();
+this.copyFile = inputFileBaseDescriptor.getCopyFile();
+ }
+
+ public Integer getCheckpointIntervalMs() {
+return checkpointIntervalMs;
+ }
+
+ public void setCheckpointIntervalMs(Integer checkpointIntervalMs) {
+this.checkpointIntervalMs = checkpointIntervalMs;
+ }
+
+ public Boolean getProcessFile() {
+return processFile;
+ }
+
+ public void setProcessFile(Boolean processFile) {
+this.processFile = processFile;
+ }
+
+ public Boolean getCopyFile() {
+return copyFile;
+ }
+
+ public void setCopyFile(Boolean copyFile) {
+this.copyFil
[43/50] [abbrv] ambari git commit: AMBARI-21081 : Upgrade to 2.5.1 from 2.5.0 adds cgroups related configs back to YARN and indicates restart required. (smohanty via avijayan)
AMBARI-21081 : Upgrade to 2.5.1 from 2.5.0 adds cgroups related configs back to YARN and indicates restart required. (smohanty via avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6c683214 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6c683214 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6c683214 Branch: refs/heads/ambari-rest-api-explorer Commit: 6c68321448099167748efc8981103934a617dc11 Parents: 5ea441a Author: Aravindan Vijayan Authored: Mon May 22 10:31:50 2017 -0700 Committer: Aravindan Vijayan Committed: Mon May 22 10:31:50 2017 -0700 -- .../stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/6c683214/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml index 0eb3366..d0b4bb1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml @@ -193,7 +193,7 @@ yarn_cgroups_enabled - + yarn.nodemanager.linux-container-executor.cgroups.hierarchy @@ -205,7 +205,7 @@ yarn_cgroups_enabled - + yarn.nodemanager.linux-container-executor.cgroups.mount @@ -217,7 +217,7 @@ yarn_cgroups_enabled - + yarn.nodemanager.linux-container-executor.cgroups.mount-path @@ -229,7 +229,7 @@ yarn_cgroups_enabled - + yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage
[39/50] [abbrv] ambari git commit: AMBARI-21067. Atlas config values not getting populated on BP cluster install with strategy : NEVER_APPLY (magyari_sandor)
AMBARI-21067. Atlas config values not getting populated on BP cluster install with strategy : NEVER_APPLY (magyari_sandor) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/74972de5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/74972de5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/74972de5 Branch: refs/heads/ambari-rest-api-explorer Commit: 74972de559b21633288c03785dc672e792a172bb Parents: fd4a7a4 Author: Sandor Magyari Authored: Fri May 19 09:06:24 2017 +0200 Committer: Sandor Magyari Committed: Mon May 22 14:27:38 2017 +0200 -- .../0.7.0.2.5/configuration/application-properties.xml| 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/74972de5/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/application-properties.xml -- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/application-properties.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/application-properties.xml index 70af02c..f34d8be 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/application-properties.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.2.5/configuration/application-properties.xml @@ -24,7 +24,7 @@ atlas.audit.hbase.zookeeper.quorum - +localhost @@ -38,7 +38,7 @@ atlas.graph.storage.hostname - +localhost @@ -66,7 +66,7 @@ atlas.graph.index.search.solr.zookeeper-url - +localhost:2181/infra-solr The ZooKeeper quorum setup for Solr as comma separated value. @@ -145,7 +145,7 @@ atlas.kafka.bootstrap.servers - +localhost:6667 Comma separated list of Kafka broker endpoints in host:port form @@ -157,7 +157,7 @@ atlas.kafka.zookeeper.connect - +localhost:2181 Comma separated list of servers forming Zookeeper quorum used by Kafka.
[12/50] [abbrv] ambari git commit: AMBARI-21039. Atlas web UI inaccessible after adding Atlas service on upgraded cluster with Hive because /etc/atlas/conf symlink was created ahead of time (alejandro
AMBARI-21039. Atlas web UI inaccessible after adding Atlas service on upgraded
cluster with Hive because /etc/atlas/conf symlink was created ahead of time
(alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9cb87011
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9cb87011
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9cb87011
Branch: refs/heads/ambari-rest-api-explorer
Commit: 9cb87011c716e6fc8eeec0b2ca57a75fa9c7d2d9
Parents: 2e27f66
Author: Alejandro Fernandez
Authored: Thu May 18 12:16:33 2017 -0400
Committer: Alejandro Fernandez
Committed: Thu May 18 12:16:33 2017 -0400
--
.../libraries/functions/conf_select.py | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9cb87011/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
index ce00f0c..facf186 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
@@ -356,11 +356,16 @@ def select(stack_name, package, version, try_create=True,
ignore_errors=False):
then the Atlas RPM will not be able to copy its artifacts into
/etc/atlas/conf directory and therefore
prevent Ambari from by copying those unmanaged contents into
/etc/atlas/$version/0
'''
- parent_dir = os.path.dirname(current_dir)
- if os.path.exists(parent_dir):
-Link(conf_dir, to=current_dir)
+ component_list = default("/localComponents", [])
+ if "ATLAS_SERVER" in component_list or "ATLAS_CLIENT" in
component_list:
+Logger.info("Atlas is installed on this host.")
+parent_dir = os.path.dirname(current_dir)
+if os.path.exists(parent_dir):
+ Link(conf_dir, to=current_dir)
+else:
+ Logger.info("Will not create symlink from {0} to {1} because
the destination's parent dir does not exist.".format(conf_dir, current_dir))
else:
-Logger.info("Will not create symlink from {0} to {1} because
the destination's parent dir does not exist.".format(conf_dir, current_dir))
+Logger.info("Will not create symlink from {0} to {1} because
Atlas is not installed on this host.".format(conf_dir, current_dir))
else:
# Normal path for other packages
Link(conf_dir, to=current_dir)
[24/50] [abbrv] ambari git commit: AMBARI-21074 - Storm XML File has Invalid Characters Causing Exceptions on Server Startup (jonathanhurley)
AMBARI-21074 - Storm XML File has Invalid Characters Causing Exceptions on
Server Startup (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f952c9ee
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f952c9ee
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f952c9ee
Branch: refs/heads/ambari-rest-api-explorer
Commit: f952c9eecdc8cba07117ecb39265f05e6ef47341
Parents: f2bbe47
Author: Jonathan Hurley
Authored: Fri May 19 10:19:49 2017 -0400
Committer: Jonathan Hurley
Committed: Fri May 19 10:19:49 2017 -0400
--
.../common-services/STORM/0.9.1/configuration/storm-env.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f952c9ee/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml
index cfa33e2..3d4edad 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml
@@ -128,11 +128,11 @@ export STORM_HOME={{storm_component_home_dir}}
#set storm-auto creds
# check if storm_jaas.conf in config , only enable storm_auto_creds in secure
mode.
-STORM_HOME="$(dirname $(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))"
+STORM_HOME="$(dirname $(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd
))"
STORM_JAAS_CONF=$STORM_HOME/config/storm_jaas.conf
STORM_AUTOCREDS_LIB_DIR=/usr/hdp/current/storm-client/external/storm-autocreds
-if [ -f $STORM_JAAS_CONF ] && [ -d $STORM_AUTOCREDS_LIB_DIR ]; then
+if [ -f $STORM_JAAS_CONF ] && [ -d $STORM_AUTOCREDS_LIB_DIR ]; then
export STORM_EXT_CLASSPATH=$STORM_AUTOCREDS_LIB_DIR
fi
[15/50] [abbrv] ambari git commit: AMBARI-21048. HDP 3.0 TP - create service definition for Storm with configs, kerberos, widgets, etc.(vbrodetsky)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab4d28a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/params_linux.py
new file mode 100644
index 000..78ec165
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/params_linux.py
@@ -0,0 +1,424 @@
+#!/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
+import ambari_simplejson as json # simplejson is much faster comparing to
Python 2.6 json module and has the same functions set.
+
+import status_params
+
+from ambari_commons.constants import AMBARI_SUDO_BINARY
+from ambari_commons import yaml_utils
+from resource_management.libraries.functions import format
+from resource_management.libraries.functions.default import default
+from resource_management.libraries.functions.get_bare_principal import
get_bare_principal
+from resource_management.libraries.script import Script
+from resource_management.libraries.resources.hdfs_resource import HdfsResource
+from resource_management.libraries.functions import stack_select
+from resource_management.libraries.functions import conf_select
+from resource_management.libraries.functions import get_kinit_path
+from resource_management.libraries.functions.get_not_managed_resources import
get_not_managed_resources
+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.expect import expect
+from resource_management.libraries.functions.setup_atlas_hook import
has_atlas_in_cluster
+from resource_management.libraries.functions import is_empty
+from ambari_commons.ambari_metrics_helper import
select_metric_collector_hosts_from_hostnames
+from resource_management.libraries.functions.setup_ranger_plugin_xml import
get_audit_configs, generate_ranger_service_config
+
+# server configurations
+config = Script.get_config()
+tmp_dir = Script.get_tmp_dir()
+stack_root = status_params.stack_root
+sudo = AMBARI_SUDO_BINARY
+
+limits_conf_dir = "/etc/security/limits.d"
+
+# Needed since this is an Atlas Hook service.
+cluster_name = config['clusterName']
+
+stack_name = status_params.stack_name
+upgrade_direction = default("/commandParams/upgrade_direction", None)
+version = default("/commandParams/version", None)
+
+agent_stack_retry_on_unavailability =
config['hostLevelParams']['agent_stack_retry_on_unavailability']
+agent_stack_retry_count = expect("/hostLevelParams/agent_stack_retry_count",
int)
+
+storm_component_home_dir = status_params.storm_component_home_dir
+conf_dir = status_params.conf_dir
+
+stack_version_unformatted = status_params.stack_version_unformatted
+stack_version_formatted = status_params.stack_version_formatted
+stack_supports_ru = stack_version_formatted and
check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted)
+stack_supports_storm_kerberos = stack_version_formatted and
check_stack_feature(StackFeature.STORM_KERBEROS, stack_version_formatted)
+stack_supports_storm_ams = stack_version_formatted and
check_stack_feature(StackFeature.STORM_AMS, stack_version_formatted)
+stack_supports_core_site_for_ranger_plugin =
check_stack_feature(StackFeature.CORE_SITE_FOR_RANGER_PLUGINS_SUPPORT,
stack_version_formatted)
+
+# get the correct version to use for checking stack features
+version_for_stack_feature_checks = get_stack_feature_version(config)
+
+stack_supports_ranger_kerberos =
check_stack_feature(StackFeature.RANGER_KERBEROS_SUPPORT,
version_for_stack_feature_checks)
+stack_supports_ranger_audit_db =
check_stack_feature(StackFeature.RANGER_AUDIT_DB_SUPPORT,
version_for_stack_feature_checks)
+
+# default hadoop params
+rest_lib_dir = "/usr/lib/storm/contrib/storm-rest"
+storm_bin_dir = "/usr/bin"
+storm_lib_dir = "/usr/lib/s
[45/50] [abbrv] ambari git commit: AMBARI-21082 - Ambari 3.0: Outstanding wizard issues (rzang)
AMBARI-21082 - Ambari 3.0: Outstanding wizard issues (rzang)
Change-Id: Ia6e54d7dbd529cce59d3e2cdcc8fd6ed6a04ce1b
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9415478d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9415478d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9415478d
Branch: refs/heads/ambari-rest-api-explorer
Commit: 9415478dca03caf7f55ba21e8f00d954dc117757
Parents: 0626b78
Author: Richard Zang
Authored: Mon May 22 19:29:03 2017 -0700
Committer: Richard Zang
Committed: Mon May 22 19:29:03 2017 -0700
--
ambari-web/app/styles/application.less| 11 ++-
ambari-web/app/templates/wizard/step4.hbs | 16
ambari-web/app/views/wizard/step4_view.js | 7 ++-
3 files changed, 24 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9415478d/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 2fc1cf2..95990b8 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2671,4 +2671,13 @@ a.abort-icon:hover {
&.overlay-visible {
display: block;
}
-}
\ No newline at end of file
+}
+
+.step-marker {
+ .step-index {
+display: block;
+margin-top: -1px;
+margin-left: 0.3px;
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/9415478d/ambari-web/app/templates/wizard/step4.hbs
--
diff --git a/ambari-web/app/templates/wizard/step4.hbs
b/ambari-web/app/templates/wizard/step4.hbs
index 9f1d7df..5a08250 100644
--- a/ambari-web/app/templates/wizard/step4.hbs
+++ b/ambari-web/app/templates/wizard/step4.hbs
@@ -34,17 +34,17 @@
-{{#each controller}}
+{{#each service in controller}}
{{#unless isHiddenOnSelectServicePage}}
-
- {{displayNameOnSelectServicePage}}
- {{serviceVersionDisplay}}
- {{{comments}}}
+
+ {{service.displayNameOnSelectServicePage}}
+ {{service.serviceVersionDisplay}}
+ {{{service.comments}}}
- {{view App.CheckboxView
checkboxClassNamesBinding="serviceName" data-qa="toggle-service"
- disabledBinding="isDisabled"
- checkedBinding="isSelected"
+ {{view App.CheckboxView
checkboxClassNamesBinding="service.serviceName" data-qa="toggle-service"
+ disabledBinding="service.isDisabled"
+ checkedBinding="service.isSelected"
}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9415478d/ambari-web/app/views/wizard/step4_view.js
--
diff --git a/ambari-web/app/views/wizard/step4_view.js
b/ambari-web/app/views/wizard/step4_view.js
index 137b9f5..928d46c 100644
--- a/ambari-web/app/views/wizard/step4_view.js
+++ b/ambari-web/app/views/wizard/step4_view.js
@@ -21,6 +21,11 @@ var App = require('app');
App.WizardStep4View = Em.View.extend({
- templateName: require('templates/wizard/step4')
+ templateName: require('templates/wizard/step4'),
+ toggleCheckBox: function(event) {
+if (event.context.get('isDisabled')) { return; }
+var isSelected = event.context.get('isSelected');
+event.context.set('isSelected', !isSelected);
+ }
});
[13/50] [abbrv] ambari git commit: Revert "AMBARI-21046. UI: Upgrades should be started using repo_version_ids instead of version strings (alexantonenko)"
Revert "AMBARI-21046. UI: Upgrades should be started using repo_version_ids
instead of version strings (alexantonenko)"
This reverts commit 1568f800764a6b20f2f09330f112070ebc0f7f86.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0e5f2470
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0e5f2470
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0e5f2470
Branch: refs/heads/ambari-rest-api-explorer
Commit: 0e5f24700afad30b5f0ac0512442019dedf392cb
Parents: 9cb8701
Author: Alex Antonenko
Authored: Thu May 18 19:40:31 2017 +0300
Committer: Alex Antonenko
Committed: Thu May 18 19:41:47 2017 +0300
--
.../controllers/main/admin/stack_and_upgrade_controller.js| 7 ++-
ambari-web/app/utils/ajax/ajax.js | 4 ++--
.../main/admin/stack_and_upgrade_controller_test.js | 6 --
3 files changed, 4 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e5f2470/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 d444b2d..0f2efb0 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
@@ -414,8 +414,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
if (currentVersion) {
this.set('currentVersion', {
repository_version:
currentVersion.get('repositoryVersion.repositoryVersion'),
-repository_name: currentVersion.get('repositoryVersion.displayName'),
-id: currentVersion.get('repositoryVersion.id')
+repository_name: currentVersion.get('repositoryVersion.displayName')
});
}
},
@@ -737,7 +736,6 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
from: App.RepositoryVersion.find().findProperty('displayName',
this.get('upgradeVersion')).get('repositoryVersion'),
value: currentVersion.repository_version,
label: currentVersion.repository_name,
-id: currentVersion.id,
isDowngrade: true,
upgradeType: this.get('upgradeType')
},
@@ -1381,8 +1379,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
label: version.get('displayName'),
type: version.get('upgradeType'),
skipComponentFailures: version.get('skipComponentFailures') ? 'true' :
'false',
- skipSCFailures: version.get('skipSCFailures') ? 'true' : 'false',
- id: version.get('id')
+ skipSCFailures: version.get('skipSCFailures') ? 'true' : 'false'
};
if (App.get('supports.preUpgradeCheck')) {
this.set('requestInProgress', true);
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e5f2470/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 4dc04f4..f7d0914 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1712,7 +1712,7 @@ var urls = {
timeout : 60,
data: JSON.stringify({
"Upgrade": {
-"repository_version_id": data.id,
+"repository_version": data.value,
"upgrade_type": data.type,
"skip_failures": data.skipComponentFailures,
"skip_service_check_failures": data.skipSCFailures,
@@ -1731,7 +1731,7 @@ var urls = {
data: JSON.stringify({
"Upgrade": {
"from_version": data.from,
-"repository_version_id": data.id,
+"repository_version": data.value,
"upgrade_type": data.upgradeType,
"direction": "DOWNGRADE"
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e5f2470/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 fa0a0b9..e696bb1 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
@@ -128,7 +128,6 @@ describe('App.MainAdminStackAndUpgradeController',
function() {
sinon.stub(App.StackVersion, 'find').returns([Em.Object.create({
state: 'CURRENT',
repositoryVersion: {
- id: '1',
[28/50] [abbrv] ambari git commit: Revert "ADDENDUM. AMBARI-21011. Upgrade Code. Append PATH to YARN config 'yarn.nodemanager.admin-env' for HDP 2.6."
Revert "ADDENDUM. AMBARI-21011. Upgrade Code. Append PATH to YARN config 'yarn.nodemanager.admin-env' for HDP 2.6." This reverts commit d0a5cd4a6b22f0c8e02bb7ceb2d5de11314f542a. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a61f985 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a61f985 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a61f985 Branch: refs/heads/ambari-rest-api-explorer Commit: 0a61f9857ec95162801fc2c8aae05fef67fbbd52 Parents: d740384 Author: Swapan Shridhar Authored: Sat May 20 00:28:27 2017 -0700 Committer: Swapan Shridhar Committed: Sat May 20 00:29:40 2017 -0700 -- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 8 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 -- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 - .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 6 +- .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 -- .../resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 - .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 8 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 -- .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 4 .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 13 - .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 7 --- .../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 - 12 files changed, 1 insertion(+), 66 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/0a61f985/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml index 98bb056..8b5c07d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml @@ -546,14 +546,6 @@ - - - -yarn-site - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/0a61f985/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml index 4d2b3ec..5aa08c5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml @@ -353,12 +353,6 @@ - - - Updating YARN NodeManager admin env config - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/0a61f985/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml index f1dd943..d98bb53 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml @@ -789,7 +789,6 @@ - http://git-wip-us.apache.org/repos/asf/ambari/blob/0a61f985/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml index b448a2d..b3d19d4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml @@ -332,11 +332,7 @@ - -yarn-site - - - + http://git-wip-us.apache.org/repos/asf/ambari/blob/0a61f985/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml index 4920f12..4a2a502
[18/50] [abbrv] ambari git commit: AMBARI-21051. HDP 3.0 TP - create Service Advisor for Storm.(vbrodetsky)
AMBARI-21051. HDP 3.0 TP - create Service Advisor for Storm.(vbrodetsky)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7dc2ddc7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7dc2ddc7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7dc2ddc7
Branch: refs/heads/ambari-rest-api-explorer
Commit: 7dc2ddc72bce3dc944191c7797d2672c1f3b4fcb
Parents: 6ab4d28
Author: Vitaly Brodetskyi
Authored: Thu May 18 20:39:00 2017 +0300
Committer: Vitaly Brodetskyi
Committed: Thu May 18 20:39:00 2017 +0300
--
.../STORM/1.0.1.3.0/service_advisor.py | 387 +++
1 file changed, 387 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7dc2ddc7/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/service_advisor.py
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/service_advisor.py
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/service_advisor.py
new file mode 100644
index 000..1d6bbe0
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/service_advisor.py
@@ -0,0 +1,387 @@
+#!/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
+from resource_management.libraries.functions.get_bare_principal import
get_bare_principal
+
+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 StormServiceAdvisor(service_advisor.ServiceAdvisor):
+
+ def __init__(self, *args, **kwargs):
+self.as_super = super(StormServiceAdvisor, 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.
+"""
+#Logg
[07/50] [abbrv] ambari git commit: AMBARI-21031. Add docker support for infra manager (oleewere)
AMBARI-21031. Add docker support for infra manager (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8bf136a4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8bf136a4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8bf136a4
Branch: refs/heads/ambari-rest-api-explorer
Commit: 8bf136a4b78b495de849565400f24a7cc2cbd834
Parents: 1568f80
Author: oleewere
Authored: Tue May 16 13:57:12 2017 +0200
Committer: oleewere
Committed: Wed May 17 19:35:46 2017 +0200
--
ambari-infra/ambari-infra-assembly/pom.xml | 6 +-
ambari-infra/ambari-infra-manager/README.md | 6 ++
ambari-infra/ambari-infra-manager/build.xml | 1 +
.../ambari-infra-manager/docker/Dockerfile | 52
.../ambari-infra-manager/docker/bin/start.sh| 21 +
.../docker/infra-manager-docker.sh | 85
.../src/main/resources/infra-manager-env.sh | 18 +
.../src/main/resources/infraManager.sh | 2 +-
8 files changed, 188 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8bf136a4/ambari-infra/ambari-infra-assembly/pom.xml
--
diff --git a/ambari-infra/ambari-infra-assembly/pom.xml
b/ambari-infra/ambari-infra-assembly/pom.xml
index 550d97c..fafef7e 100644
--- a/ambari-infra/ambari-infra-assembly/pom.xml
+++ b/ambari-infra/ambari-infra-assembly/pom.xml
@@ -140,6 +140,7 @@
log4j.xml
infra-manager.properties
+infra-manager-env.sh
@@ -152,6 +153,7 @@
log4j.xml
infra-manager.properties
+infra-manager-env.sh
@@ -341,7 +343,7 @@
${infra-manager.mapping.path}
-log4j.xml,infra-manager.properties
+log4j.xml,infra-manager.properties,infra-manager-env.sh
@@ -355,7 +357,7 @@
644
-log4j.xml,infra-manager.properties
+log4j.xml,infra-manager.properties,infra-manager-env.sh
http://git-wip-us.apache.org/repos/asf/ambari/blob/8bf136a4/ambari-infra/ambari-infra-manager/README.md
--
diff --git a/ambari-infra/ambari-infra-manager/README.md
b/ambari-infra/ambari-infra-manager/README.md
index 033bbb2..d3527c4 100644
--- a/ambari-infra/ambari-infra-manager/README.md
+++ b/ambari-infra/ambari-infra-manager/README.md
@@ -22,4 +22,10 @@ TODO
## Build & Run Application
```bash
mvn clean package exec:java
+```
+
+## Build & Run Application in docker container
+```bash
+cd docker
+./infra-manager-docker.sh
```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/8bf136a4/ambari-infra/ambari-infra-manager/build.xml
--
diff --git a/ambari-infra/ambari-infra-manager/build.xml
b/ambari-infra/ambari-infra-manager/build.xml
index c7954d9..3d0f4da 100644
--- a/ambari-infra/ambari-infra-manager/build.xml
+++ b/ambari-infra/ambari-infra-manager/build.xml
@@ -35,6 +35,7 @@
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/8bf136a4/ambari-infra/ambari-infra-manager/docker/Dockerfile
--
diff --git a/ambari-infra/ambari-infra-manager/docker/Dockerfile
b/ambari-infra/ambari-infra-manager/docker/Dockerfile
new file mode 100644
index 000..adb584a
--- /dev/null
+++ b/ambari-infra/ambari-infra-manager/docker/Dockerfile
@@ -0,0 +1,52 @@
+# 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.
+
+FROM centos:centos6
+
+RUN echo root:changeme | ch
[02/50] [abbrv] ambari git commit: AMBARI-20532 Ambari-server CLI to setup Database Options Broken (dsen)
AMBARI-20532 Ambari-server CLI to setup Database Options Broken (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/772be786
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/772be786
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/772be786
Branch: refs/heads/ambari-rest-api-explorer
Commit: 772be786d930322e4a95e4755c36ffece24d30e4
Parents: 735c413
Author: Dmytro Sen
Authored: Wed May 17 19:07:44 2017 +0300
Committer: Dmytro Sen
Committed: Wed May 17 19:07:44 2017 +0300
--
ambari-server/src/main/python/ambari-server.py | 299 --
.../main/python/ambari_server/setupMpacks.py| 7 +-
.../src/test/python/TestAmbariServer.py | 409 ++-
3 files changed, 389 insertions(+), 326 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/772be786/ambari-server/src/main/python/ambari-server.py
--
diff --git a/ambari-server/src/main/python/ambari-server.py
b/ambari-server/src/main/python/ambari-server.py
index 737be6a..4f680cb 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -367,7 +367,7 @@ def print_action_arguments_help(action):
";".join([print_opt for print_opt, _ in optional_options]))
@OsFamilyFuncImpl(OSConst.WINSRV_FAMILY)
-def init_parser_options(parser):
+def init_action_parser(action, parser):
parser.add_option('-k', '--service-user-name', dest="svc_user",
default=None,
help="User account under which the Ambari Server service
will run")
@@ -455,31 +455,58 @@ def init_parser_options(parser):
# -h reserved for help
@OsFamilyFuncImpl(OsFamilyImpl.DEFAULT)
-def init_parser_options(parser):
- parser.add_option('-f', '--init-script-file', default=None,
-help="File with setup script")
- parser.add_option('-r', '--drop-script-file', default=None,
-help="File with drop script")
- parser.add_option('-u', '--upgrade-script-file',
default=AmbariPath.get("/var/lib/"
-
"ambari-server/resources/upgrade/ddl/"
-
"Ambari-DDL-Postgres-UPGRADE-1.3.0.sql"),
-help="File with upgrade script")
- parser.add_option('-t', '--upgrade-stack-script-file',
default=AmbariPath.get("/var/lib/"
-
"ambari-server/resources/upgrade/dml/"
-
"Ambari-DML-Postgres-UPGRADE_STACK.sql"),
-help="File with stack upgrade script")
- parser.add_option('-j', '--java-home', default=None,
-help="Use specified java_home. Must be valid on all
hosts")
- parser.add_option("-v", "--verbose",
-action="store_true", dest="verbose", default=False,
-help="Print verbose status messages")
- parser.add_option("-s", "--silent",
-action="store_true", dest="silent", default=False,
-help="Silently accepts default prompt values. For
db-cleanup command, silent mode will stop ambari server.")
+def init_setup_parser_options(parser):
+ database_group = optparse.OptionGroup(parser, 'Database options (command
need to include all options)')
+ database_group.add_option('--database', default=None, help="Database to use
embedded|oracle|mysql|mssql|postgres|sqlanywhere", dest="dbms")
+ database_group.add_option('--databasehost', default=None, help="Hostname of
database server", dest="database_host")
+ database_group.add_option('--databaseport', default=None, help="Database
port", dest="database_port")
+ database_group.add_option('--databasename', default=None,
help="Database/Service name or ServiceID",
+dest="database_name")
+ database_group.add_option('--databaseusername', default=None, help="Database
user login", dest="database_username")
+ database_group.add_option('--databasepassword', default=None, help="Database
user password", dest="database_password")
+ parser.add_option_group(database_group)
+
+ jdbc_group = optparse.OptionGroup(parser, 'JDBC options (command need to
include all options)')
+ jdbc_group.add_option('--jdbc-driver', default=None, help="Specifies the
path to the JDBC driver JAR file or archive " \
+"with all required
files(jdbc jar, libraries and etc), for the " \
+"database type
specified with the --jdbc-db option. " \
+"Used o
[16/50] [abbrv] ambari git commit: AMBARI-21048. HDP 3.0 TP - create service definition for Storm with configs, kerberos, widgets, etc.(vbrodetsky)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab4d28a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/configuration/storm-worker-log4j.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/configuration/storm-worker-log4j.xml
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/configuration/storm-worker-log4j.xml
new file mode 100644
index 000..46291f7
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/configuration/storm-worker-log4j.xml
@@ -0,0 +1,189 @@
+
+
+
+
+
+storm_wrkr_a1_maxfilesize
+100
+The maximum size of backup file before the log is
rotated
+Storm Worker Log: backup file size
+
+ MB
+
+
+
+
+storm_wrkr_a1_maxbackupindex
+9
+The number of backup files
+Storm Worker Log: # of backup files
+
+ int
+ 0
+
+
+
+
+storm_wrkr_out_maxfilesize
+100
+The maximum size of backup file before the log is
rotated
+Storm Worker Standard out Log: backup file
size
+
+ MB
+
+
+
+
+storm_wrkr_out_maxbackupindex
+4
+The number of backup files
+Storm Worker Standard out Log: # of backup
files
+
+ int
+ 0
+
+
+
+
+storm_wrkr_err_maxfilesize
+100
+The maximum size of backup file before the log is
rotated
+Storm Worker Standard Error Log: backup file
size
+
+ MB
+
+
+
+
+storm_wrkr_err_maxbackupindex
+4
+The number of backup files
+Storm Worker Standard Error Log: # of backup
files
+
+ int
+ 0
+
+
+
+
+content
+storm-worker-log4j template
+Custom worker.xml
+
+
+ content
+ false
+
+
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab4d28a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/kerberos.json
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/kerberos.json
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/kerberos.json
new file mode 100644
index 000..a034411
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/kerberos.json
@@ -0,0 +1,134 @@
+{
+ "services": [
+{
+ "name": "STORM",
+ "identities": [
+{
+ "name": "/spnego"
+},
+{
+ "name": "/smokeuser"
+},
+{
+ "name": "storm_components",
+ "principal": {
+"value": "${storm-env/storm_user}${principal_suffix}@${realm}",
+"type": "user",
+"configuration": "storm-env/storm_principal_name"
+ },
+ "keytab": {
+"file": "${keytab_dir}/storm.headless.keytab",
+"owner": {
+ "name": "${storm-env/storm_user}",
+ "access": "r"
+},
+"group": {
+ "name": "${cluster-env/user_group}",
+ "access": ""
+},
+"configuration": "storm-env/storm_keytab"
+ }
+},
+{
+ "name": "/STORM/storm_components",
+ "principal": {
+"configuration":
"storm-atlas-application.properties/atlas.jaas.KafkaClient.option.principal"
+ },
+ "keytab": {
+"configuration":
"storm-atlas-application.properties/atlas.jaas.KafkaClient.option.keyTab"
+ }
+}
+ ],
+ "configurations": [
+{
+ "storm-site": {
+"nimbus.authorizer":
"org.apache.storm.security.auth.authorizer.SimpleACLAuthorizer",
+"drpc.authorizer":
"org.apache.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer",
+"ui.filter":
"org.apache.hadoop.security.authentication.server.AuthenticationFilter",
+"storm.principal.tolocal":
"org.apache.storm.security.auth.KerberosPrincipalToLocal",
+"supervisor.enable": "true",
+"storm.zookeeper.superACL": "sasl:{{storm_bare_jaas_principal}}",
+"java.security.auth.login.config": "{{conf_dir}}/storm_jaas.conf",
+"nimbus.impersonation.authorizer":
"org.apache.storm.security.auth.authorizer.ImpersonationAuthorizer",
+"nimbus.impersonation.acl": "{ {{storm_bare_jaas_principal}} :
{hosts: ['*'], groups: ['*']}}",
+"nimbus.admins": "['{{storm_bare_jaas_principal}}',
'{{ambari_bare_jaas_principal}}']",
+"nimbus.supervisor.users": "['{{storm_bare_jaas_principal}}']",
+"ui.filter.params": "{'type': 'kerberos', 'kerberos.principal':
'{{storm_ui_jaas_principal}}', 'kerberos.keytab': '{{storm_ui_keytab_path}}',
'kerberos.name.rules': 'DEFAULT'}"
+ }
+},
+{
+ "ranger-storm-audit": {
+"xasecure.audit.jaas.Client
[32/50] [abbrv] ambari git commit: Revert "Revert "ADDENDUM. AMBARI-21011. Upgrade Code. Append PATH to YARN config 'yarn.nodemanager.admin-env' for HDP 2.6.""
Revert "Revert "ADDENDUM. AMBARI-21011. Upgrade Code. Append PATH to YARN config 'yarn.nodemanager.admin-env' for HDP 2.6."" This reverts commit 0a61f9857ec95162801fc2c8aae05fef67fbbd52. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ccd6b25e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ccd6b25e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ccd6b25e Branch: refs/heads/ambari-rest-api-explorer Commit: ccd6b25ed2f053a9b1b2045fd0cf41f4472e657e Parents: 9ffef7f Author: Swapan Shridhar Authored: Mon May 22 01:10:15 2017 -0700 Committer: Swapan Shridhar Committed: Mon May 22 01:11:15 2017 -0700 -- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 8 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 ++ .../resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 + .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 6 +- .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 ++ .../resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 + .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 8 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 ++ .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 4 .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 13 + .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 7 +++ .../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 + 12 files changed, 66 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/ccd6b25e/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml index 8b5c07d..98bb056 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml @@ -546,6 +546,14 @@ + + + +yarn-site + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/ccd6b25e/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml index 5aa08c5..4d2b3ec 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml @@ -353,6 +353,12 @@ + + + Updating YARN NodeManager admin env config + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/ccd6b25e/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml index d98bb53..f1dd943 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml @@ -789,6 +789,7 @@ + http://git-wip-us.apache.org/repos/asf/ambari/blob/ccd6b25e/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml index b3d19d4..b448a2d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml @@ -332,7 +332,11 @@ - + +yarn-site + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/ccd6b25e/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml index 4a2a502.
[05/50] [abbrv] ambari git commit: AMBARI-20758 Aggregate local metrics for minute aggregation time window (dsen)
AMBARI-20758 Aggregate local metrics for minute aggregation time window (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/041d353b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/041d353b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/041d353b Branch: refs/heads/ambari-rest-api-explorer Commit: 041d353b0d75b20b0322097e13a1701226e6fc97 Parents: 772be78 Author: Dmytro Sen Authored: Wed May 17 19:38:29 2017 +0300 Committer: Dmytro Sen Committed: Wed May 17 19:38:29 2017 +0300 -- .../logfeeder/metrics/LogFeederAMSClient.java | 12 +- ambari-metrics/ambari-metrics-assembly/pom.xml | 20 +++ .../src/main/assembly/monitor-windows.xml | 7 + .../src/main/assembly/monitor.xml | 9 +- .../timeline/AbstractTimelineMetricsSink.java | 24 ++- .../sink/timeline/AggregationResult.java| 60 +++ .../metrics2/sink/timeline/MetricAggregate.java | 110 .../sink/timeline/MetricClusterAggregate.java | 73 .../sink/timeline/MetricHostAggregate.java | 81 + .../metrics2/sink/timeline/TimelineMetric.java | 6 +- .../TimelineMetricWithAggregatedValues.java | 65 +++ .../AbstractTimelineMetricSinkTest.java | 10 ++ .../availability/MetricCollectorHATest.java | 10 ++ .../cache/HandleConnectExceptionTest.java | 10 ++ .../sink/flume/FlumeTimelineMetricsSink.java| 16 ++ .../timeline/HadoopTimelineMetricsSink.java | 20 ++- .../conf/unix/log4j.properties | 31 .../conf/windows/log4j.properties | 29 +++ .../ambari-metrics-host-aggregator/pom.xml | 120 + .../AbstractMetricPublisherThread.java | 134 ++ .../aggregator/AggregatedMetricsPublisher.java | 101 +++ .../host/aggregator/AggregatorApplication.java | 180 +++ .../host/aggregator/AggregatorWebService.java | 56 ++ .../host/aggregator/RawMetricsPublisher.java| 60 +++ .../host/aggregator/TimelineMetricsHolder.java | 98 ++ .../conf/unix/ambari-metrics-monitor| 2 +- .../src/main/python/core/aggregator.py | 110 .../src/main/python/core/config_reader.py | 35 +++- .../src/main/python/core/controller.py | 28 +++ .../src/main/python/core/emitter.py | 8 +- .../src/main/python/core/stop_handler.py| 3 +- .../src/main/python/main.py | 6 +- .../kafka/KafkaTimelineMetricsReporter.java | 17 ++ .../storm/StormTimelineMetricsReporter.java | 14 ++ .../sink/storm/StormTimelineMetricsSink.java| 14 ++ .../storm/StormTimelineMetricsReporter.java | 16 ++ .../sink/storm/StormTimelineMetricsSink.java| 16 ++ .../timeline/HBaseTimelineMetricStore.java | 29 ++- .../metrics/timeline/PhoenixHBaseAccessor.java | 4 +- .../timeline/TimelineMetricConfiguration.java | 2 + .../metrics/timeline/TimelineMetricStore.java | 2 + .../timeline/TimelineMetricsAggregatorSink.java | 4 +- .../timeline/aggregators/MetricAggregate.java | 110 .../aggregators/MetricClusterAggregate.java | 73 .../aggregators/MetricHostAggregate.java| 81 - .../TimelineMetricAppAggregator.java| 1 + .../TimelineMetricClusterAggregator.java| 2 + .../TimelineMetricClusterAggregatorSecond.java | 1 + .../TimelineMetricHostAggregator.java | 1 + .../aggregators/TimelineMetricReadHelper.java | 2 + .../webapp/TimelineWebServices.java | 31 .../timeline/ITPhoenixHBaseAccessor.java| 4 +- .../metrics/timeline/MetricTestHelper.java | 2 +- .../timeline/PhoenixHBaseAccessorTest.java | 4 +- .../timeline/TestMetricHostAggregate.java | 8 +- .../timeline/TestTimelineMetricStore.java | 6 + .../TimelineMetricsAggregatorMemorySink.java| 4 +- .../aggregators/ITClusterAggregator.java| 4 +- .../aggregators/ITMetricAggregator.java | 13 +- ...melineMetricClusterAggregatorSecondTest.java | 1 + ambari-metrics/pom.xml | 1 + .../system/impl/AmbariMetricSinkImpl.java | 10 ++ .../1.6.1.2.2.0/package/scripts/params.py | 2 + .../hadoop-metrics2-accumulo.properties.j2 | 3 + .../0.1.0/configuration/ams-env.xml | 8 + .../0.1.0/configuration/ams-site.xml| 11 ++ .../AMBARI_METRICS/0.1.0/metainfo.xml | 3 + .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 30 .../0.1.0/package/scripts/params.py | 5 + .../hadoop-metrics2-hbase.properties.j2 | 3 + .../package/templates/metric_monitor.ini.j2 | 7 + .../FLUME/1.4.0.2.0/package/scripts/params.py | 3 + .../templates/flume-metrics2.properties.j2
[17/50] [abbrv] ambari git commit: AMBARI-21048. HDP 3.0 TP - create service definition for Storm with configs, kerberos, widgets, etc.(vbrodetsky)
AMBARI-21048. HDP 3.0 TP - create service definition for Storm with configs,
kerberos, widgets, etc.(vbrodetsky)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ab4d28a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ab4d28a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ab4d28a
Branch: refs/heads/ambari-rest-api-explorer
Commit: 6ab4d28a6973cec9a2d04592bfa6fcdfcf081988
Parents: 0e5f247
Author: Vitaly Brodetskyi
Authored: Thu May 18 20:33:04 2017 +0300
Committer: Vitaly Brodetskyi
Committed: Thu May 18 20:33:43 2017 +0300
--
.../common-services/STORM/1.0.1.3.0/alerts.json | 145 +++
.../configuration/ranger-storm-audit.xml| 133 ++
.../ranger-storm-plugin-properties.xml | 121 ++
.../ranger-storm-policymgr-ssl.xml | 70 +
.../configuration/ranger-storm-security.xml | 67 +
.../storm-atlas-application.properties.xml | 31 +
.../configuration/storm-cluster-log4j.xml | 133 ++
.../STORM/1.0.1.3.0/configuration/storm-env.xml | 165 +++
.../1.0.1.3.0/configuration/storm-site.xml | 1002 +++
.../configuration/storm-worker-log4j.xml| 189 +++
.../STORM/1.0.1.3.0/kerberos.json | 134 ++
.../STORM/1.0.1.3.0/metainfo.xml| 179 +++
.../STORM/1.0.1.3.0/metrics.json| 1202 ++
.../alerts/check_supervisor_process_win.py | 50 +
.../STORM/1.0.1.3.0/package/files/wordCount.jar | Bin 0 -> 690588 bytes
.../1.0.1.3.0/package/scripts/drpc_server.py| 91 ++
.../STORM/1.0.1.3.0/package/scripts/nimbus.py | 116 ++
.../1.0.1.3.0/package/scripts/nimbus_prod.py| 81 ++
.../1.0.1.3.0/package/scripts/pacemaker.py | 90 ++
.../STORM/1.0.1.3.0/package/scripts/params.py | 28 +
.../1.0.1.3.0/package/scripts/params_linux.py | 424 ++
.../1.0.1.3.0/package/scripts/params_windows.py | 60 +
.../STORM/1.0.1.3.0/package/scripts/rest_api.py | 85 ++
.../STORM/1.0.1.3.0/package/scripts/service.py | 95 ++
.../1.0.1.3.0/package/scripts/service_check.py | 79 ++
.../package/scripts/setup_ranger_storm.py | 133 ++
.../1.0.1.3.0/package/scripts/status_params.py | 83 ++
.../STORM/1.0.1.3.0/package/scripts/storm.py| 182 +++
.../1.0.1.3.0/package/scripts/storm_upgrade.py | 177 +++
.../package/scripts/storm_yaml_utils.py | 53 +
.../1.0.1.3.0/package/scripts/supervisor.py | 117 ++
.../package/scripts/supervisor_prod.py | 84 ++
.../package/scripts/supervisord_service.py | 33 +
.../1.0.1.3.0/package/scripts/ui_server.py | 137 ++
.../package/templates/client_jaas.conf.j2 | 33 +
.../1.0.1.3.0/package/templates/config.yaml.j2 | 75 ++
.../templates/input.config-storm.json.j2| 78 ++
.../templates/storm-metrics2.properties.j2 | 34 +
.../1.0.1.3.0/package/templates/storm.conf.j2 | 35 +
.../package/templates/storm_jaas.conf.j2| 65 +
.../package/templates/worker-launcher.cfg.j2| 19 +
.../STORM/1.0.1.3.0/quicklinks/quicklinks.json | 45 +
.../STORM/1.0.1.3.0/role_command_order.json | 13 +
.../STORM/1.0.1.3.0/widgets.json| 127 ++
.../stacks/HDP/3.0/services/STORM/metainfo.xml | 27 +
45 files changed, 6320 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab4d28a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/alerts.json
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/alerts.json
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/alerts.json
new file mode 100644
index 000..acd9d85
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/alerts.json
@@ -0,0 +1,145 @@
+{
+ "STORM": {
+"service": [
+ {
+"name": "storm_supervisor_process_percent",
+"label": "Percent Supervisors Available",
+"interval": 1,
+"scope": "SERVICE",
+"enabled": true,
+"source": {
+ "type": "AGGREGATE",
+ "alert_name": "storm_supervisor_process",
+ "reporting": {
+"ok": {
+ "text": "affected: [{1}], total: [{0}]"
+},
+"warning": {
+ "text": "affected: [{1}], total: [{0}]",
+ "value": 10
+},
+"critical": {
+ "text": "affected: [{1}], total: [{0}]",
+ "value": 30
+},
+"units" : "%",
+"type": "PERCENT"
+ }
+}
+ }
+],
+"STORM_UI_SERVER": [
+ {
+"name": "storm_webui",
+"label": "Storm Web UI",
+"interval": 1,
+"scope": "ANY",
+
