ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [4/6] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-160
Date Fri, 06 Feb 2015 14:35:36 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d803519d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySnapshotHistoryTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySnapshotHistoryTest.java
index 0000000,e19fa5b..32f4a05
mode 000000,100644..100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySnapshotHistoryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySnapshotHistoryTest.java
@@@ -1,0 -1,174 +1,173 @@@
+ /*
+  * 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.ignite.spi.discovery.tcp;
+ 
+ import org.apache.ignite.*;
+ import org.apache.ignite.configuration.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.spi.discovery.*;
+ import org.apache.ignite.testframework.junits.common.*;
+ 
+ import static org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi.*;
+ 
+ /**
+  * Tests for topology snapshots history.
+  */
+ public class TcpDiscoverySnapshotHistoryTest extends GridCommonAbstractTest {
+     /** */
+     public TcpDiscoverySnapshotHistoryTest() {
+         super(false);
+     }
+ 
+     /** {@inheritDoc} */
+     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
+         IgniteConfiguration cfg = super.getConfiguration(gridName);
+ 
+         cfg.setDiscoverySpi(new TcpDiscoverySpi());
+         cfg.setCacheConfiguration();
+         cfg.setLocalHost("127.0.0.1");
 -        cfg.setRestEnabled(false);
+ 
+         return cfg;
+     }
+ 
+     /**
+      * @throws Exception If any error occurs.
+      */
+     public void testHistorySupported() throws Exception {
+         try {
+             final Ignite g = startGrid();
+ 
+             DiscoverySpi spi = g.configuration().getDiscoverySpi();
+ 
+             DiscoverySpiHistorySupport ann = U.getAnnotation(spi.getClass(), DiscoverySpiHistorySupport.class);
+ 
+             assertNotNull("Spi does not have annotation for history support", ann);
+ 
+             assertTrue("History support is disabled for current spi", ann.value());
+         }
+         finally {
+             stopGrid();
+         }
+     }
+ 
+     /**
+      * @throws Exception If any error occurs.
+      */
+     public void testSettingNewTopologyHistorySize() throws Exception {
+         try {
+             final Ignite g = startGrid();
+ 
+             TcpDiscoverySpi spi = (TcpDiscoverySpi)g.configuration().getDiscoverySpi();
+ 
+             assertEquals(DFLT_TOP_HISTORY_SIZE, spi.getTopHistorySize());
+ 
+             spi.setTopHistorySize(DFLT_TOP_HISTORY_SIZE + 1);
+ 
+             assertEquals(DFLT_TOP_HISTORY_SIZE + 1, spi.getTopHistorySize());
+ 
+             spi.setTopHistorySize(1);
+ 
+             assertEquals(DFLT_TOP_HISTORY_SIZE + 1, spi.getTopHistorySize());
+         }
+         finally {
+             stopGrid();
+         }
+     }
+ 
+     /**
+      * @throws Exception If any error occurs.
+      */
+     public void testNodeAdded() throws Exception {
+         try {
+             // Add grid #1
+             final Ignite g1 = startGrid(1);
+ 
+             assertTopVer(1, g1);
+ 
+             assertEquals(1, g1.cluster().topologyVersion());
+ 
+             // Add grid # 2
+             final Ignite g2 = startGrid(2);
+ 
+             assertTopVer(2, g1, g2);
+ 
+             for (int i = 1; i <= 2; i++)
+                 assertEquals(i, g2.cluster().topology(i).size());
+ 
+             // Add grid # 3
+             final Ignite g3 = startGrid(3);
+ 
+             assertTopVer(3, g1, g2, g3);
+ 
+             for (int i = 1; i <= 3; i++)
+                 assertEquals(i, g3.cluster().topology(i).size());
+         }
+         finally {
+             stopAllGrids();
+         }
+     }
+ 
+     /**
+      * @throws Exception If any error occurs.
+      */
+     public void testNodeAddedAndRemoved() throws Exception {
+         try {
+             // Add grid #1
+             final Ignite g1 = startGrid(1);
+ 
+             assertTopVer(1, g1);
+ 
+             assertEquals(1, g1.cluster().topologyVersion());
+ 
+             // Add grid #2
+             final Ignite g2 = startGrid(2);
+ 
+             assertTopVer(2, g1, g2);
+ 
+             for (int i = 1; i <= 2; i++)
+                 assertEquals(i, g2.cluster().topology(i).size());
+ 
+             // Add grid #3
+             final Ignite g3 = startGrid(3);
+ 
+             assertTopVer(3, g1, g2, g3);
+ 
+             for (int i = 1; i <= 3; i++)
+                 assertEquals(i, g3.cluster().topology(i).size());
+ 
+             // Stop grid #3
+             stopGrid(g3.name());
+ 
+             assertTopVer(4, g1, g2);
+         }
+         finally {
+             stopAllGrids();
+         }
+     }
+ 
+     /**
+      * Check if specified grid instances have unexpected topology version.
+      *
+      * @param expTopVer Expected topology version.
+      * @param ignites Grid instances for checking topology version.
+      */
+     private static void assertTopVer(long expTopVer, Ignite... ignites) {
+         for (Ignite g : ignites)
+             assertEquals("Grid has wrong topology version.", expTopVer, g.cluster().topologyVersion());
+     }
+ }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d803519d/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d803519d/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d803519d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d803519d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d803519d/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d803519d/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d803519d/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d803519d/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------


Mime
View raw message