ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject ambari git commit: AMBARI-16945 - Unit Test Failures On Trunk For Config Upgrades And Metrics Providers (jonathanhurley)
Date Sat, 28 May 2016 21:12:38 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 198f58808 -> bd1fc28d8


AMBARI-16945 - Unit Test Failures On Trunk For Config Upgrades And Metrics Providers (jonathanhurley)


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

Branch: refs/heads/branch-2.4
Commit: bd1fc28d804029ab75ce1f8a1df64d2ef7c27ae7
Parents: 198f588
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Sat May 28 17:12:12 2016 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Sat May 28 17:12:31 2016 -0400

----------------------------------------------------------------------
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  | 25 +++++++++++++++++++
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  | 25 +++++++++++++++++++
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  | 26 --------------------
 .../server/configuration/ConfigurationTest.java |  4 +--
 .../metrics/JMXPropertyProviderTest.java        |  2 +-
 5 files changed, 53 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bd1fc28d/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 1287d57..1130d9a 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
@@ -399,6 +399,31 @@
             <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
             <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
           </definition>
+          
+          <definition xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0">
+            <type>storm-site</type>
+            <replace key="_storm.thrift.nonsecure.transport" find="backtype.storm.security.auth.SimpleTransportPlugin"
+                     replace-with="org.apache.storm.security.auth.SimpleTransportPlugin"
/>
+            <replace key="_storm.thrift.secure.transport" find="backtype.storm.security.auth.KerberosSaslTransportPlugin"
+                     replace-with="org.apache.storm.security.auth.KerberosSaslTransportPlugin"
/>
+            <replace key="storm.messaging.transport" find="backtype.storm.messaging.netty.Context"
+                     replace-with="org.apache.storm.messaging.netty.Context" />
+            <replace key="nimbus.topology.validator" find="backtype.storm.nimbus.DefaultTopologyValidator"
+                     replace-with="org.apache.storm.nimbus.DefaultTopologyValidator" />
+            <replace key="topology.spout.wait.strategy" find="backtype.storm.spout.SleepSpoutWaitStrategy"
+                     replace-with="org.apache.storm.spout.SleepSpoutWaitStrategy" />
+            <replace key="topology.kryo.factory" find="backtype.storm.serialization.DefaultKryoFactory"
+                     replace-with="org.apache.storm.serialization.DefaultKryoFactory" />
+            <replace key="topology.tuple.serializer" find="backtype.storm.serialization.types.ListDelegateSerializer"
+                     replace-with="org.apache.storm.serialization.types.ListDelegateSerializer"
/>
+            <replace key="nimbus.authorizer" find="backtype.storm.security.auth.authorizer.SimpleACLAuthorizer"
+                     replace-with="org.apache.storm.security.auth.authorizer.SimpleACLAuthorizer"
/>
+            <replace key="drpc.authorizer" find="backtype.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer"
+                     replace-with="org.apache.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer"
/>
+            <replace key="ui.filter" find="backtype.storm.security.auth.KerberosPrincipalToLocal"
+                     replace-with="org.apache.storm.security.auth.KerberosPrincipalToLocal"
/>
+            <set key="client.jartransformer.class" value="org.apache.storm.hack.StormShadeTransformer"
/>
+          </definition>          
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bd1fc28d/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 dd0e456..b68354f 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
@@ -205,6 +205,31 @@
             <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file"
/>
             <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir"
/>
           </definition>
+          
+          <definition xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0">
+            <type>storm-site</type>
+            <replace key="_storm.thrift.nonsecure.transport" find="backtype.storm.security.auth.SimpleTransportPlugin"
+                     replace-with="org.apache.storm.security.auth.SimpleTransportPlugin"
/>
+            <replace key="_storm.thrift.secure.transport" find="backtype.storm.security.auth.KerberosSaslTransportPlugin"
+                     replace-with="org.apache.storm.security.auth.KerberosSaslTransportPlugin"
/>
+            <replace key="storm.messaging.transport" find="backtype.storm.messaging.netty.Context"
+                     replace-with="org.apache.storm.messaging.netty.Context" />
+            <replace key="nimbus.topology.validator" find="backtype.storm.nimbus.DefaultTopologyValidator"
+                     replace-with="org.apache.storm.nimbus.DefaultTopologyValidator" />
+            <replace key="topology.spout.wait.strategy" find="backtype.storm.spout.SleepSpoutWaitStrategy"
+                     replace-with="org.apache.storm.spout.SleepSpoutWaitStrategy" />
+            <replace key="topology.kryo.factory" find="backtype.storm.serialization.DefaultKryoFactory"
+                     replace-with="org.apache.storm.serialization.DefaultKryoFactory" />
+            <replace key="topology.tuple.serializer" find="backtype.storm.serialization.types.ListDelegateSerializer"
+                     replace-with="org.apache.storm.serialization.types.ListDelegateSerializer"
/>
+            <replace key="nimbus.authorizer" find="backtype.storm.security.auth.authorizer.SimpleACLAuthorizer"
+                     replace-with="org.apache.storm.security.auth.authorizer.SimpleACLAuthorizer"
/>
+            <replace key="drpc.authorizer" find="backtype.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer"
+                     replace-with="org.apache.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer"
/>
+            <replace key="ui.filter" find="backtype.storm.security.auth.KerberosPrincipalToLocal"
+                     replace-with="org.apache.storm.security.auth.KerberosPrincipalToLocal"
/>
+            <set key="client.jartransformer.class" value="org.apache.storm.hack.StormShadeTransformer"
/>
+          </definition>          
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bd1fc28d/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 96c6515..5211276 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -47,32 +47,6 @@
               <value>10001</value>
             </condition>
           </definition>
-
-          <definition xsi:type="configure" id="hdp_2_5_0_0_upgrade_storm_1.0">
-            <type>storm-site</type>
-            <replace key="_storm.thrift.nonsecure.transport" find="backtype.storm.security.auth.SimpleTransportPlugin"
-                     replace-with="org.apache.storm.security.auth.SimpleTransportPlugin"
/>
-            <replace key="_storm.thrift.secure.transport" find="backtype.storm.security.auth.KerberosSaslTransportPlugin"
-                     replace-with="org.apache.storm.security.auth.KerberosSaslTransportPlugin"
/>
-            <replace key="storm.messaging.transport" find="backtype.storm.messaging.netty.Context"
-                     replace-with="org.apache.storm.messaging.netty.Context" />
-            <replace key="nimbus.topology.validator" find="backtype.storm.nimbus.DefaultTopologyValidator"
-                     replace-with="org.apache.storm.nimbus.DefaultTopologyValidator" />
-            <replace key="topology.spout.wait.strategy" find="backtype.storm.spout.SleepSpoutWaitStrategy"
-                     replace-with="org.apache.storm.spout.SleepSpoutWaitStrategy" />
-            <replace key="topology.kryo.factory" find="backtype.storm.serialization.DefaultKryoFactory"
-                     replace-with="org.apache.storm.serialization.DefaultKryoFactory" />
-            <replace key="topology.tuple.serializer" find="backtype.storm.serialization.types.ListDelegateSerializer"
-                     replace-with="org.apache.storm.serialization.types.ListDelegateSerializer"
/>
-            <replace key="nimbus.authorizer" find="backtype.storm.security.auth.authorizer.SimpleACLAuthorizer"
-                     replace-with="org.apache.storm.security.auth.authorizer.SimpleACLAuthorizer"
/>
-            <replace key="drpc.authorizer" find="backtype.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer"
-                     replace-with="org.apache.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer"
/>
-            <replace key="ui.filter" find="backtype.storm.security.auth.KerberosPrincipalToLocal"
-                     replace-with="org.apache.storm.security.auth.KerberosPrincipalToLocal"
/>
-            <set key="client.jartransformer.class" value="org.apache.storm.hack.StormShadeTransformer"
/>
-          </definition>
-
         </changes>
       </component>
     </service>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bd1fc28d/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
index d1895bd..b5d0e02 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java
@@ -813,7 +813,7 @@ public class ConfigurationTest {
     Assert.assertTrue(completionServiceTimeout <= LARGEST_COMPLETION_SERIVCE_TIMEOUT_MS);
     Assert.assertTrue(corePoolSize <= maxPoolSize);
     Assert.assertTrue(corePoolSize > 2 && corePoolSize <= 32);
-    Assert.assertTrue(maxPoolSize > 2 && maxPoolSize <= 32);
+    Assert.assertTrue(maxPoolSize > 2 && maxPoolSize <= processorCount * 4);
     Assert.assertTrue(workerQueueSize > processorCount * 10);
   }
 
@@ -849,7 +849,7 @@ public class ConfigurationTest {
 
     Assert.assertTrue(cacheTimeout >= LOWEST_CACHE_TIMEOUT_MINUTES);
     Assert.assertTrue(corePoolSize > 2 && corePoolSize <= 32);
-    Assert.assertTrue(maxPoolSize > 2 && maxPoolSize <= 32);
+    Assert.assertTrue(maxPoolSize > 2 && maxPoolSize <= processorCount * 4);
     Assert.assertTrue(workerQueueSize >= processorCount * 10);
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/bd1fc28d/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 fa8d0eb..ef574dc 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
@@ -71,7 +71,7 @@ public class JMXPropertyProviderTest {
   protected static final String HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("HostRoles",
"component_name");
   protected static final String HOST_COMPONENT_STATE_PROPERTY_ID = PropertyHelper.getPropertyId("HostRoles",
"state");
 
-  public static final int NUMBER_OF_RESOURCES = 400;
+  public static final int NUMBER_OF_RESOURCES = 350;
   private static MetricPropertyProviderFactory metricPropertyProviderFactory;
 
   @BeforeClass


Mime
View raw message