ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [49/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-709
Date Mon, 13 Apr 2015 06:41:20 GMT
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-709


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

Branch: refs/heads/ignite-709
Commit: 8c2851777b95f45227341cde1229d366ef1e11f1
Parents: ec8e099 fceebf2
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Apr 13 09:20:59 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Apr 13 09:20:59 2015 +0300

----------------------------------------------------------------------
 RELEASE_NOTES.txt                               |  13 +
 assembly/release-hadoop.xml                     |   4 -
 bin/ignitevisorcmd.bat                          |  39 +--
 examples/pom.xml                                |   2 +-
 .../streaming/wordcount/CacheConfig.java        |   5 +
 .../streaming/wordcount/QueryWords.java         |   4 +-
 modules/aop/pom.xml                             |   2 +-
 modules/aws/pom.xml                             |   2 +-
 modules/clients/pom.xml                         |   2 +-
 .../client/ClientReconnectionSelfTest.java      |   2 +
 modules/codegen/pom.xml                         |   2 +-
 modules/core/pom.xml                            |   4 +-
 .../java/org/apache/ignite/IgniteCache.java     |  19 +-
 .../java/org/apache/ignite/IgniteState.java     |   2 +-
 .../apache/ignite/IgniteSystemProperties.java   |   7 +
 .../apache/ignite/cache/query/ScanQuery.java    |   2 +-
 .../ignite/cache/query/SqlFieldsQuery.java      |  55 +++-
 .../configuration/CacheConfiguration.java       |  76 +++--
 .../configuration/IgniteConfiguration.java      |  16 +-
 .../ignite/internal/ClusterMetricsSnapshot.java |   3 -
 .../internal/ComputeTaskInternalFuture.java     |   2 +-
 .../apache/ignite/internal/GridComponent.java   |   5 +-
 .../ignite/internal/GridJobExecuteRequest.java  |  10 +-
 .../ignite/internal/GridJobExecuteResponse.java |   4 +-
 .../ignite/internal/GridPluginComponent.java    |   5 +-
 .../apache/ignite/internal/GridTaskMessage.java |  30 --
 .../ignite/internal/GridTaskSessionRequest.java |   6 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   4 +-
 .../client/GridClientConfiguration.java         |  14 +-
 .../GridClientConnectionManagerAdapter.java     |   2 +-
 .../router/GridTcpRouterConfiguration.java      |   6 +-
 .../internal/cluster/ClusterGroupAdapter.java   | 150 ++++++++--
 .../internal/managers/GridManagerAdapter.java   |   8 +-
 .../discovery/GridDiscoveryManager.java         |  39 ++-
 .../eventstorage/GridEventStorageManager.java   |   4 +-
 .../processors/GridProcessorAdapter.java        |   5 +-
 .../processors/cache/CacheMetricsImpl.java      |   7 +-
 .../processors/cache/CacheMetricsSnapshot.java  | 223 ++++++++++++++-
 .../processors/cache/GridCacheAdapter.java      |  12 +-
 .../processors/cache/GridCacheContext.java      |   6 +-
 .../processors/cache/GridCacheProcessor.java    |   4 +-
 .../processors/cache/IgniteCacheProxy.java      |  26 ++
 .../dht/atomic/GridDhtAtomicCache.java          |   6 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   3 +-
 .../GridDhtPartitionsExchangeFuture.java        |   3 +
 .../distributed/near/GridNearAtomicCache.java   |   2 +-
 .../near/GridNearTransactionalCache.java        |   2 +-
 .../cache/local/GridLocalLockFuture.java        |   2 +
 .../local/atomic/GridLocalAtomicCache.java      |   6 +-
 .../cache/query/GridCacheQueryAdapter.java      |   2 +-
 .../continuous/CacheContinuousQueryManager.java |   2 +-
 .../transactions/IgniteTxLocalAdapter.java      |   6 +-
 .../continuous/GridContinuousProcessor.java     |   4 +-
 .../internal/processors/igfs/IgfsAsyncImpl.java |   4 +-
 .../ignite/internal/processors/igfs/IgfsEx.java |   4 +-
 .../processors/igfs/IgfsFileWorker.java         | 180 ------------
 .../processors/igfs/IgfsFileWorkerBatch.java    | 225 ++++++---------
 .../processors/igfs/IgfsFileWorkerTask.java     |  32 ---
 .../internal/processors/igfs/IgfsImpl.java      | 150 ++++++----
 .../processors/igfs/IgfsInputStreamImpl.java    |   2 +-
 .../processors/igfs/IgfsOutputStreamImpl.java   |   6 +-
 .../internal/processors/igfs/IgfsProcessor.java |   2 +-
 .../plugin/IgnitePluginProcessor.java           |  13 +-
 .../query/GridQueryFieldMetadata.java           |   2 +-
 .../processors/query/GridQueryProcessor.java    |  89 +++---
 .../processors/rest/GridRestProcessor.java      |  33 +--
 .../security/GridSecurityProcessor.java         |  13 +-
 .../processors/security/SecurityContext.java    |   8 +-
 .../security/os/GridOsSecurityProcessor.java    |  11 +-
 .../processors/task/GridTaskProcessor.java      |   9 +-
 .../ignite/internal/util/GridJavaProcess.java   |  38 ++-
 .../visor/cache/VisorCacheClearTask.java        |   3 +
 .../visor/cache/VisorCacheConfiguration.java    |   2 +-
 .../internal/visor/cache/VisorCacheMetrics.java |   2 +-
 .../internal/visor/log/VisorLogSearchTask.java  |  12 +-
 .../visor/node/VisorNodeDataCollectorTask.java  |   1 +
 .../node/VisorNodeEventsCollectorTask.java      |   3 +
 .../node/VisorSegmentationConfiguration.java    |   4 +-
 .../internal/visor/query/VisorQueryArg.java     |  82 ++++++
 .../visor/query/VisorQueryCleanupTask.java      |  10 +-
 .../internal/visor/query/VisorQueryCursor.java  |  96 +++++++
 .../internal/visor/query/VisorQueryField.java   |  66 ++++-
 .../internal/visor/query/VisorQueryJob.java     | 174 ++++++++++++
 .../visor/query/VisorQueryNextPageTask.java     |  75 +++--
 .../internal/visor/query/VisorQueryResult.java  |   6 +-
 .../visor/query/VisorQueryResultEx.java         |  16 +-
 .../internal/visor/query/VisorQueryTask.java    | 283 ++-----------------
 .../internal/visor/query/VisorQueryUtils.java   |  55 ++--
 .../internal/visor/util/VisorTaskUtils.java     |   3 +
 .../apache/ignite/plugin/PluginProvider.java    |   5 +-
 .../plugin/security/AuthenticationContext.java  |  12 +-
 .../security/GridSecurityCredentials.java       | 184 ------------
 .../GridSecurityCredentialsBasicProvider.java   |  44 ---
 .../GridSecurityCredentialsProvider.java        |  44 ---
 .../plugin/security/GridSecurityException.java  |  58 ----
 .../plugin/security/GridSecurityPermission.java |  69 -----
 .../security/GridSecurityPermissionSet.java     |  66 -----
 .../plugin/security/GridSecuritySubject.java    |  62 ----
 .../security/GridSecuritySubjectType.java       |  48 ----
 .../plugin/security/SecurityCredentials.java    | 191 +++++++++++++
 .../SecurityCredentialsBasicProvider.java       |  44 +++
 .../security/SecurityCredentialsProvider.java   |  44 +++
 .../plugin/security/SecurityException.java      |  61 ++++
 .../plugin/security/SecurityPermission.java     |  69 +++++
 .../plugin/security/SecurityPermissionSet.java  |  66 +++++
 .../ignite/plugin/security/SecuritySubject.java |  62 ++++
 .../plugin/security/SecuritySubjectType.java    |  48 ++++
 .../segmentation/GridSegmentationPolicy.java    |  47 ---
 .../segmentation/GridSegmentationResolver.java  |  64 -----
 .../plugin/segmentation/SegmentationPolicy.java |  49 ++++
 .../segmentation/SegmentationResolver.java      |  65 +++++
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   4 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |   4 +-
 .../spi/discovery/DiscoveryMetricsProvider.java |  10 +
 .../spi/discovery/DiscoverySpiDataExchange.java |   5 +-
 .../DiscoverySpiNodeAuthenticator.java          |   2 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |  39 ++-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 147 ++++++++--
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |  27 ++
 .../tcp/internal/TcpDiscoveryNode.java          |  82 +++++-
 .../TcpDiscoveryCustomEventMessage.java         |  23 +-
 .../messages/TcpDiscoveryHeartbeatMessage.java  |  65 +++++
 .../TcpDiscoveryJoinRequestMessage.java         |   6 +-
 .../messages/TcpDiscoveryNodeAddedMessage.java  |  16 +-
 .../ignite/startup/BasicWarmupClosure.java      |   9 +-
 .../startup/cmdline/CommandLineStartup.java     |   7 +-
 .../resources/META-INF/classnames.properties    |  36 ++-
 .../cache/IgniteWarmupClosureSelfTest.java      |  82 ++++++
 .../fair/GridFairAffinityFunctionSelfTest.java  |   2 -
 .../IgniteFairAffinityDynamicCacheSelfTest.java |  97 +++++++
 .../internal/GridLifecycleAwareSelfTest.java    |   2 +-
 .../ignite/internal/GridProjectionSelfTest.java |  82 ++++++
 .../CacheMetricsForClusterGroupSelfTest.java    | 252 +++++++++++++++++
 ...CacheOffHeapMultiThreadedUpdateSelfTest.java |   5 +
 .../GridCacheSetFailoverAbstractSelfTest.java   |   2 +
 .../continuous/GridEventConsumeSelfTest.java    |   3 +-
 .../processors/igfs/IgfsAbstractSelfTest.java   |  16 +-
 .../discovery/AbstractDiscoverySelfTest.java    |   4 +-
 ...ClusterMetricsSnapshotSerializeSelfTest.java |  28 ++
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |   5 +-
 .../testframework/GridSpiTestContext.java       |   4 +-
 .../junits/spi/GridSpiAbstractTest.java         |  76 +----
 .../IgniteCacheMetricsSelfTestSuite.java        |   4 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |   6 +
 modules/extdata/p2p/pom.xml                     |   2 +-
 .../p2p/startcache/CacheAllNodesFilter.java     |  31 ++
 .../CacheConfigurationP2PTestClient.java        | 118 ++++++++
 .../tests/p2p/startcache/Organization1.java     |  52 ++++
 .../tests/p2p/startcache/Organization2.java     |  52 ++++
 modules/extdata/uri/pom.xml                     |   2 +-
 modules/geospatial/pom.xml                      |   2 +-
 modules/hadoop/docs/hadoop_readme.pdf           | Bin 82297 -> 82219 bytes
 modules/hadoop/pom.xml                          |   2 +-
 .../HadoopDefaultMapReducePlannerSelfTest.java  |   2 +-
 modules/hibernate/pom.xml                       |   2 +-
 modules/indexing/pom.xml                        |   2 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  19 +-
 .../query/h2/sql/GridSqlQuerySplitter.java      |  18 +-
 .../query/h2/twostep/GridMergeIndex.java        |  17 +-
 .../cache/CacheConfigurationP2PTest.java        | 179 ++++++++++++
 .../cache/CacheConfigurationP2PTestServer.java  |  49 ++++
 .../IgniteCacheCollocatedQuerySelfTest.java     | 209 ++++++++++++++
 .../cache/IgniteCacheLargeResultSelfTest.java   | 104 +++++++
 .../query/h2/sql/BaseH2CompareQueryTest.java    |  20 ++
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +
 .../IgniteCacheWithIndexingTestSuite.java       |   2 +
 modules/jcl/pom.xml                             |   2 +-
 modules/jta/pom.xml                             |   2 +-
 modules/log4j/pom.xml                           |   2 +-
 modules/rest-http/pom.xml                       |   2 +-
 .../http/jetty/GridJettyRestHandler.java        |   2 +-
 modules/scalar/pom.xml                          |   2 +-
 modules/schedule/pom.xml                        |   2 +-
 modules/schema-import/pom.xml                   |   2 +-
 modules/slf4j/pom.xml                           |   2 +-
 modules/spring/pom.xml                          |   2 +-
 modules/ssh/pom.xml                             |   2 +-
 modules/tools/pom.xml                           |   2 +-
 .../ignite/tools/classgen/ClassesGenerator.java |   2 +-
 modules/urideploy/pom.xml                       |   2 +-
 modules/visor-console/pom.xml                   |   2 +-
 .../ignite/visor/commands/VisorConsole.scala    |  19 ++
 .../commands/cache/VisorCacheScanCommand.scala  |  13 +-
 modules/visor-plugins/pom.xml                   |   2 +-
 modules/web/pom.xml                             |   2 +-
 modules/yardstick/pom.xml                       |   2 +-
 pom.xml                                         |  51 ++--
 187 files changed, 4150 insertions(+), 1994 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c285177/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 7920810,2ab8e8f..f690039
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@@ -1156,58 -1163,19 +1166,64 @@@ public class TcpClientDiscoverySpi exte
          }
  
          /**
 +         * @param msg Message.
 +         */
 +        private void processCustomMessage(TcpDiscoveryCustomEventMessage msg) {
 +            if (msg.verified()) {
 +                DiscoverySpiListener lsnr = TcpClientDiscoverySpi.this.lsnr;
 +
 +                if (lsnr != null) {
 +                    TcpDiscoveryNode node = nodeId.equals(getLocalNodeId()) ? locNode :
rmtNodes.get(nodeId);
 +
 +                    if (node != null && node.visible())
 +                        notifyDiscovery(EVT_DISCOVERY_CUSTOM_EVT, topVer, node, allNodes(),
msg.message());
 +                    else if (log.isDebugEnabled())
 +                        log.debug("Received metrics from unknown node: " + nodeId);
 +                }
 +            }
 +            else {
 +                if (getLocalNodeId().equals(msg.creatorNodeId())) {
 +                    Socket sock0 = sock;
 +
 +                    if (sock0 != null) {
 +                        try {
 +                            writeToSocket(sock0, msg);
 +
 +                            if (log.isDebugEnabled())
 +                                log.debug("Heartbeat message sent [sock=" + sock0 + ", msg="
+ msg + ']');
 +                        }
 +                        catch (IOException | IgniteCheckedException e) {
 +                            if (log.isDebugEnabled())
 +                                U.error(log, "Failed to send custom message [sock=" + sock0
+
 +                                    ", msg=" + msg + ']', e);
 +
 +                            U.closeQuiet(sock0);
 +
 +                            sock = null;
 +
 +                            interrupt();
 +                        }
 +                    }
 +                    else if (log.isDebugEnabled())
 +                        log.debug("Failed to send custom message (node is disconnected):
" + msg);
 +                }
 +            }
 +        }
 +
 +        /**
           * @param nodeId Node ID.
           * @param metrics Metrics.
+          * @param cacheMetrics Cache metrics.
           * @param tstamp Timestamp.
           */
-         private void updateMetrics(UUID nodeId, ClusterMetrics metrics, long tstamp) {
+         private void updateMetrics(UUID nodeId,
+             ClusterMetrics metrics,
+             Map<Integer, CacheMetrics> cacheMetrics,
+             long tstamp)
+         {
              assert nodeId != null;
              assert metrics != null;
+             assert cacheMetrics != null;
  
              TcpDiscoveryNode node = nodeId.equals(getLocalNodeId()) ? locNode : rmtNodes.get(nodeId);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8c285177/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
----------------------------------------------------------------------


Mime
View raw message