Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 015BC200C5B for ; Thu, 27 Apr 2017 10:05:43 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F4214160BB5; Thu, 27 Apr 2017 08:05:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 23298160BBD for ; Thu, 27 Apr 2017 10:05:41 +0200 (CEST) Received: (qmail 71759 invoked by uid 500); 27 Apr 2017 08:05:41 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 71573 invoked by uid 99); 27 Apr 2017 08:05:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Apr 2017 08:05:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F020DE1863; Thu, 27 Apr 2017 08:05:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Thu, 27 Apr 2017 08:05:47 -0000 Message-Id: <4d85059c9548483a8d24de58b0fc033a@git.apache.org> In-Reply-To: <14c6587cf59d44a3a04bd063da306064@git.apache.org> References: <14c6587cf59d44a3a04bd063da306064@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/9] ignite git commit: Merge branch 'ignite-2.0' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5072-merge archived-at: Thu, 27 Apr 2017 08:05:43 -0000 Merge branch 'ignite-2.0' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5072-merge Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cde2accf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cde2accf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cde2accf Branch: refs/heads/ignite-5072-merge Commit: cde2accfc96181bb0888f90640c16f72f9ef7289 Parents: 5dd7042 f5db974 Author: Alexey Goncharuk Authored: Thu Apr 27 10:43:34 2017 +0300 Committer: Alexey Goncharuk Committed: Thu Apr 27 10:43:34 2017 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 124 ++++++++-- .../configuration/DataPageEvictionMode.java | 17 +- .../cache/DynamicCacheDescriptor.java | 24 ++ .../cache/GridCacheSharedContext.java | 18 +- .../cache/transactions/IgniteTxManager.java | 20 +- .../cache/transactions/TxDeadlock.java | 19 +- .../cache/transactions/TxLocksResponse.java | 37 +-- .../utils/PlatformConfigurationUtils.java | 9 +- .../visor/binary/VisorBinaryMetadata.java | 8 +- .../VisorBinaryMetadataCollectorTask.java | 16 +- .../VisorBinaryMetadataCollectorTaskArg.java | 71 ++++++ .../VisorBinaryMetadataCollectorTaskResult.java | 4 +- .../cache/VisorCacheAffinityConfiguration.java | 8 +- .../visor/cache/VisorCacheClearTask.java | 19 +- .../visor/cache/VisorCacheClearTaskArg.java | 72 ++++++ .../visor/cache/VisorCacheConfiguration.java | 149 ++++++++++++ .../VisorCacheConfigurationCollectorJob.java | 12 +- .../VisorCacheConfigurationCollectorTask.java | 5 +- ...VisorCacheConfigurationCollectorTaskArg.java | 74 ++++++ .../visor/cache/VisorCacheLoadTask.java | 5 +- .../visor/cache/VisorCacheLoadTaskArg.java | 2 +- .../visor/cache/VisorCacheMetadataTask.java | 14 +- .../visor/cache/VisorCacheMetadataTaskArg.java | 72 ++++++ .../visor/cache/VisorCacheNodesTask.java | 12 +- .../visor/cache/VisorCacheNodesTaskArg.java | 72 ++++++ .../cache/VisorCacheRebalanceConfiguration.java | 26 +++ .../visor/cache/VisorCacheRebalanceTask.java | 13 +- .../visor/cache/VisorCacheRebalanceTaskArg.java | 73 ++++++ .../visor/cache/VisorCacheResetMetricsTask.java | 14 +- .../cache/VisorCacheResetMetricsTaskArg.java | 72 ++++++ .../visor/cache/VisorCacheStartArg.java | 100 --------- .../visor/cache/VisorCacheStopTask.java | 17 +- .../visor/cache/VisorCacheStopTaskArg.java | 72 ++++++ .../cache/VisorCacheStoreConfiguration.java | 14 ++ .../internal/visor/cache/VisorPartitionMap.java | 24 +- .../compute/VisorComputeCancelSessionsTask.java | 13 +- .../VisorComputeCancelSessionsTaskArg.java | 76 +++++++ .../visor/compute/VisorGatewayTask.java | 87 +++++-- .../internal/visor/debug/VisorThreadInfo.java | 64 +++--- .../visor/debug/VisorThreadMonitorInfo.java | 8 +- .../internal/visor/file/VisorFileBlockArg.java | 114 ---------- .../visor/igfs/VisorIgfsFormatTask.java | 14 +- .../visor/igfs/VisorIgfsFormatTaskArg.java | 72 ++++++ .../visor/igfs/VisorIgfsProfilerClearTask.java | 24 +- .../igfs/VisorIgfsProfilerClearTaskArg.java | 72 ++++++ .../igfs/VisorIgfsProfilerClearTaskResult.java | 6 +- .../visor/igfs/VisorIgfsProfilerTask.java | 18 +- .../visor/igfs/VisorIgfsProfilerTaskArg.java | 72 ++++++ .../visor/igfs/VisorIgfsResetMetricsTask.java | 13 +- .../igfs/VisorIgfsResetMetricsTaskArg.java | 73 ++++++ .../internal/visor/log/VisorLogSearchArg.java | 114 ---------- .../internal/visor/misc/VisorAckTask.java | 14 +- .../internal/visor/misc/VisorAckTaskArg.java | 72 ++++++ .../misc/VisorChangeGridActiveStateTask.java | 12 +- .../misc/VisorChangeGridActiveStateTaskArg.java | 71 ++++++ .../visor/node/VisorBasicConfiguration.java | 224 ++++++++++++++++-- .../visor/node/VisorBinaryConfiguration.java | 131 +++++++++++ .../node/VisorBinaryTypeConfiguration.java | 150 +++++++++++++ .../visor/node/VisorCacheKeyConfiguration.java | 108 +++++++++ .../visor/node/VisorExecutorConfiguration.java | 108 +++++++++ .../node/VisorExecutorServiceConfiguration.java | 115 ++++++++++ .../visor/node/VisorGridConfiguration.java | 110 +++++++++ .../visor/node/VisorHadoopConfiguration.java | 145 ++++++++++++ .../visor/node/VisorIgfsConfiguration.java | 42 +++- .../node/VisorMemoryPolicyConfiguration.java | 41 ++++ .../internal/visor/node/VisorNodePingTask.java | 13 +- .../visor/node/VisorNodePingTaskArg.java | 73 ++++++ .../visor/node/VisorNodeSuppressedErrors.java | 6 +- .../node/VisorNodeSuppressedErrorsTask.java | 12 +- .../node/VisorNodeSuppressedErrorsTaskArg.java | 74 ++++++ .../visor/node/VisorOdbcConfiguration.java | 114 ++++++++++ .../visor/node/VisorRestConfiguration.java | 207 ++++++++++++++++- .../node/VisorSegmentationConfiguration.java | 13 ++ .../visor/node/VisorServiceConfiguration.java | 176 +++++++++++++++ .../internal/visor/query/VisorQueryArg.java | 155 ------------- .../visor/query/VisorQueryCancelTask.java | 12 +- .../visor/query/VisorQueryCancelTaskArg.java | 71 ++++++ .../visor/query/VisorQueryCleanupTask.java | 10 +- .../visor/query/VisorQueryCleanupTaskArg.java | 75 +++++++ .../VisorQueryDetailMetricsCollectorTask.java | 17 +- ...VisorQueryDetailMetricsCollectorTaskArg.java | 71 ++++++ .../query/VisorQueryResetDetailMetricsTask.java | 6 +- .../visor/query/VisorQueryResetMetricsTask.java | 18 +- .../query/VisorQueryResetMetricsTaskArg.java | 72 ++++++ .../query/VisorRunningQueriesCollectorTask.java | 16 +- .../VisorRunningQueriesCollectorTaskArg.java | 71 ++++++ .../internal/visor/query/VisorScanQueryArg.java | 157 ------------- .../visor/service/VisorCancelServiceTask.java | 12 +- .../service/VisorCancelServiceTaskArg.java | 72 ++++++ .../internal/visor/util/VisorTaskUtils.java | 23 ++ .../resources/META-INF/classnames.properties | 39 +++- ...ryConfigurationCustomSerializerSelfTest.java | 4 +- ...DeadlockDetectionMessageMarshallingTest.java | 116 ++++++++++ .../TxDeadlockDetectionUnmasrhalErrorsTest.java | 225 +++++++++++++++++++ .../GridInternalTasksLoadBalancingSelfTest.java | 7 +- .../TxDeadlockDetectionTestSuite.java | 4 + .../IgniteConfigurationSerializerTest.cs | 3 +- .../IgniteConfigurationTest.cs | 8 +- .../Discovery/Tcp/TcpDiscoverySpi.cs | 28 --- .../Apache.Ignite.Core/IgniteConfiguration.cs | 21 ++ .../IgniteConfigurationSection.xsd | 17 +- .../stream/rocketmq/RocketMQStreamerTest.java | 8 +- .../visor/commands/ack/VisorAckCommand.scala | 5 +- .../commands/cache/VisorCacheClearCommand.scala | 5 +- .../commands/cache/VisorCacheResetCommand.scala | 4 +- .../commands/cache/VisorCacheStopCommand.scala | 4 +- .../config/VisorConfigurationCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 5 +- .../web-console/backend/app/browsersHandler.js | 3 +- modules/web-console/backend/app/mongo.js | 4 +- .../app/modules/agent/AgentManager.service.js | 3 +- .../generator/ConfigurationGenerator.js | 7 +- .../generator/PlatformGenerator.js | 5 +- .../generator/defaults/Cluster.service.js | 4 +- .../frontend/app/modules/sql/sql.controller.js | 2 +- .../states/configuration/clusters/discovery.pug | 8 +- parent/pom.xml | 1 + 117 files changed, 4534 insertions(+), 1045 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cde2accf/modules/core/src/main/java/org/apache/ignite/configuration/DataPageEvictionMode.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cde2accf/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cde2accf/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java index 66d7c01,d117e5f..dedd71c --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java @@@ -58,8 -70,11 +70,11 @@@ public class VisorMemoryPolicyConfigura assert plc != null; name = plc.getName(); - size = plc.getSize(); + size = plc.getMaxSize(); swapFilePath = plc.getSwapFilePath(); + pageEvictionMode = plc.getPageEvictionMode(); + evictionThreshold = plc.getEvictionThreshold(); + emptyPagesPoolSize = plc.getEmptyPagesPoolSize(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/cde2accf/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cde2accf/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cde2accf/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd ----------------------------------------------------------------------