Merge remote-tracking branch 'remotes/origin/master' into ignite-zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a6b45282 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a6b45282 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a6b45282 Branch: refs/heads/ignite-zk Commit: a6b452823422290e19238238e119f5aaad87b6af Parents: e0aba81 39cc9b7 Author: sboikov <sboi...@gridgain.com> Authored: Wed Nov 22 13:22:14 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Nov 22 13:22:14 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/cluster/ClusterMetrics.java | 12 +- .../ClusterLocalNodeMetricsMXBeanImpl.java | 11 +- .../internal/ClusterMetricsMXBeanImpl.java | 360 +++++++++++++++++++ .../ignite/internal/ClusterMetricsSnapshot.java | 37 +- .../apache/ignite/internal/IgniteKernal.java | 40 ++- .../GridDeploymentPerVersionStore.java | 36 +- .../discovery/GridDiscoveryManager.java | 1 + .../processors/cache/ClusterCachesInfo.java | 4 +- .../processors/cache/GridCacheEntryEx.java | 13 +- .../processors/cache/GridCacheMapEntry.java | 17 +- .../cache/IgniteCacheOffheapManager.java | 19 - .../cache/IgniteCacheOffheapManagerImpl.java | 21 -- .../persistence/DataRegionMetricsImpl.java | 5 +- .../persistence/GridCacheOffheapManager.java | 7 - .../wal/FileWriteAheadLogManager.java | 4 +- .../datastructures/DataStructuresProcessor.java | 18 +- .../processors/jobmetrics/GridJobMetrics.java | 21 +- .../jobmetrics/GridJobMetricsProcessor.java | 9 +- .../processors/query/GridQueryProcessor.java | 51 ++- .../query/schema/SchemaIndexCacheFilter.java | 33 ++ .../schema/SchemaIndexCacheVisitorImpl.java | 108 +++--- .../visor/cache/VisorCacheModifyTask.java | 113 ++++++ .../visor/cache/VisorCacheModifyTaskArg.java | 114 ++++++ .../visor/cache/VisorCacheModifyTaskResult.java | 101 ++++++ .../visor/cache/VisorModifyCacheMode.java | 47 +++ .../internal/visor/query/VisorQueryTask.java | 3 - .../internal/visor/query/VisorQueryUtils.java | 25 +- .../mxbean/ClusterLocalNodeMetricsMXBean.java | 253 ------------- .../ignite/mxbean/ClusterMetricsMXBean.java | 257 +++++++++++++ .../tcp/TcpCommunicationMetricsListener.java | 225 ++++++++++++ .../communication/tcp/TcpCommunicationSpi.java | 101 ++++-- .../tcp/TcpCommunicationSpiMBean.java | 33 ++ .../resources/META-INF/classnames.properties | 77 ++-- modules/core/src/test/config/tests.properties | 1 + .../internal/ClusterNodeMetricsSelfTest.java | 4 +- .../IgniteClientReconnectCollectionsTest.java | 131 +++---- .../processors/cache/GridCacheTestEntryEx.java | 10 +- ...gnitePdsCacheAssignmentNodeRestartsTest.java | 257 +++++++++++++ .../wal/IgniteWalFlushBackgroundSelfTest.java | 35 ++ .../db/wal/IgniteWalFlushDefaultSelfTest.java | 35 ++ .../db/wal/IgniteWalFlushLogOnlySelfTest.java | 35 ++ ...lFlushMultiNodeFailoverAbstractSelfTest.java | 246 +++++++++++++ .../apache/ignite/p2p/SharedDeploymentTest.java | 128 +++++++ .../tcp/TcpCommunicationStatisticsTest.java | 201 +++++++++++ ...ClusterMetricsSnapshotSerializeSelfTest.java | 8 +- .../testsuites/IgniteCacheTestSuite6.java | 3 +- .../testsuites/IgniteP2PSelfTestSuite.java | 2 + .../ignite/testsuites/IgnitePdsTestSuite2.java | 9 + .../IgniteSpiCommunicationSelfTestSuite.java | 3 + .../tests/p2p/compute/ExternalCallable.java | 10 +- .../tests/p2p/compute/ExternalCallable1.java | 11 +- .../tests/p2p/compute/ExternalCallable2.java | 11 +- .../tests/p2p/compute/ExternalCallable.java | 59 +++ .../tests/p2p/compute/ExternalCallable1.java | 59 +++ .../tests/p2p/compute/ExternalCallable2.java | 59 +++ .../processors/query/h2/IgniteH2Indexing.java | 64 ++-- modules/web-console/frontend/app/app.js | 18 +- .../frontend/app/modules/sql/sql.controller.js | 24 +- .../app/services/LegacyUtils.service.js | 18 +- .../frontend/app/services/Messages.service.js | 5 +- modules/web-console/frontend/package.json | 2 +- .../web-console/frontend/views/sql/sql.tpl.pug | 32 +- .../frontend/views/templates/message.tpl.pug | 1 + 63 files changed, 2973 insertions(+), 684 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a6b45282/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a6b45282/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a6b45282/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ----------------------------------------------------------------------
