Merge branch 'ignite-8446-master' into ignite-8446 Signed-off-by: Anton Vinogradov <a...@apache.org>
# Conflicts: # modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa1a33ec Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa1a33ec Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa1a33ec Branch: refs/heads/ignite-8446 Commit: fa1a33ec6dac5f276629ece9b3f039f78e2b3595 Parents: c2426df ff7372b Author: Anton Vinogradov <a...@apache.org> Authored: Fri Aug 3 12:57:59 2018 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Fri Aug 3 12:57:59 2018 +0300 ---------------------------------------------------------------------- README.md | 2 +- assembly/LICENSE_FABRIC | 2 +- docker/web-agent/Dockerfile | 3 +- examples/pom.xml | 21 - .../ml/tutorial/Step_8_CV_with_Param_Grid.java | 173 ++ .../cluster/TensorFlowClusterExample.java | 118 -- .../test/config/aop/aspectj/META-INF/aop.xml | 4 +- modules/aws/pom.xml | 18 - .../apache/ignite/IgniteSystemProperties.java | 6 + .../org/apache/ignite/cache/CacheMetrics.java | 77 + .../internal/commandline/CommandHandler.java | 162 +- .../commandline/cache/CacheArguments.java | 34 + .../delta/DataPageInsertFragmentRecord.java | 2 +- .../cache/CacheClusterMetricsMXBeanImpl.java | 55 + .../cache/CacheLocalMetricsMXBeanImpl.java | 55 + .../processors/cache/CacheMetricsImpl.java | 206 ++ .../processors/cache/CacheMetricsSnapshot.java | 157 ++ .../processors/cache/GridCacheAdapter.java | 67 +- .../processors/cache/GridCacheContext.java | 4 + .../processors/cache/GridCacheEntryEx.java | 8 +- .../cache/GridCacheLoaderWriterStore.java | 6 + .../processors/cache/GridCacheMapEntry.java | 126 +- .../GridCachePartitionExchangeManager.java | 68 +- .../processors/cache/GridCachePreloader.java | 21 +- .../cache/GridCachePreloaderAdapter.java | 6 + .../cache/GridCacheUpdateAtomicResult.java | 15 +- .../cache/IgniteCacheOffheapManagerImpl.java | 3 + .../CacheDataStructuresManager.java | 5 +- .../dht/GridDhtPartitionTopologyImpl.java | 23 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 5 + .../GridDhtAtomicAbstractUpdateFuture.java | 8 +- .../GridDhtAtomicAbstractUpdateRequest.java | 16 +- .../dht/atomic/GridDhtAtomicCache.java | 63 +- .../GridDhtAtomicSingleUpdateRequest.java | 11 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 5 +- .../dht/preloader/GridDhtPartitionDemander.java | 55 +- .../dht/preloader/GridDhtPartitionSupplier.java | 26 +- .../dht/preloader/GridDhtPreloader.java | 60 +- .../preloader/GridDhtPreloaderAssignments.java | 6 +- .../preloader/latch/ExchangeLatchManager.java | 12 +- .../distributed/near/GridNearAtomicCache.java | 14 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 116 +- .../GridCacheDatabaseSharedManager.java | 46 +- .../persistence/freelist/AbstractFreeList.java | 2 +- .../persistence/freelist/CacheFreeListImpl.java | 11 + .../persistence/tree/io/AbstractDataPageIO.java | 23 +- .../continuous/CacheContinuousQueryManager.java | 20 +- .../cache/transactions/IgniteTxAdapter.java | 2 + .../cache/transactions/IgniteTxHandler.java | 20 +- .../cache/transactions/IgniteTxManager.java | 11 +- .../cache/verify/IdleVerifyDumpResult.java | 73 + .../cache/verify/IdleVerifyResultV2.java | 85 +- .../verify/VerifyBackupPartitionsDumpTask.java | 230 ++ .../cluster/DiscoveryDataClusterState.java | 7 - .../cluster/GridClusterStateProcessor.java | 2 +- .../continuous/GridContinuousProcessor.java | 72 +- .../platform/cache/PlatformCache.java | 11 + .../internal/processors/query/QueryUtils.java | 3 + .../service/GridServiceProcessor.java | 5 +- .../visor/baseline/VisorBaselineTask.java | 2 +- .../visor/baseline/VisorBaselineViewTask.java | 73 + .../internal/visor/tx/VisorTxTaskArg.java | 1 - .../internal/visor/tx/VisorTxTaskResult.java | 7 - .../visor/verify/VisorIdleVerifyDumpTask.java | 37 + .../verify/VisorIdleVerifyDumpTaskArg.java | 73 + .../visor/verify/VisorIdleVerifyJob.java | 83 + .../resources/META-INF/classnames.properties | 2 + .../ClusterBaselineNodesMetricsSelfTest.java | 1 - .../cache/CacheGetEntryAbstractTest.java | 2 +- .../cache/CacheValidatorMetricsTest.java | 4 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 417 ++++ .../processors/cache/GridCacheTestEntryEx.java | 8 +- .../IgniteCacheEntryListenerAbstractTest.java | 16 +- .../IgniteClusterActivateDeactivateTest.java | 50 + ...sExchangeOnDiscoveryHistoryOverflowTest.java | 2 - .../CacheLateAffinityAssignmentTest.java | 2 - .../dht/GridCacheDhtPreloadSelfTest.java | 68 +- .../atomic/IgniteCacheAtomicProtocolTest.java | 3 - .../GridCacheNearAtomicMetricsSelfTest.java | 71 + .../near/GridCacheNearMetricsSelfTest.java | 388 ++++ .../GridCacheRebalancingAsyncSelfTest.java | 7 +- .../GridCacheRebalancingCancelTest.java | 106 + ...idCacheRebalancingPartitionCountersTest.java | 3 +- .../GridCacheRebalancingSyncSelfTest.java | 149 +- ...ReplicatedFullApiMultithreadedSelfTest1.java | 1980 ------------------ .../PageEvictionMultinodeMixedRegionsTest.java | 2 + .../IgnitePdsCorruptedStoreTest.java | 99 +- ...lientAffinityAssignmentWithBaselineTest.java | 8 +- .../IgniteBaselineAbstractFullApiSelfTest.java | 2 + ...SlowHistoricalRebalanceSmallHistoryTest.java | 5 +- ...nitePdsCacheDestroyDuringCheckpointTest.java | 4 +- .../db/file/IgnitePdsPageReplacementTest.java | 2 + ...lFlushMultiNodeFailoverAbstractSelfTest.java | 2 +- ...usQueryFactoryFilterRandomOperationTest.java | 6 +- ...acheContinuousQueryRandomOperationsTest.java | 15 +- .../CacheContinuousQueryVariationsTest.java | 12 +- ...inuousWithTransformerReplicatedSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 6 +- .../GridMarshallerMappingConsistencyTest.java | 3 +- .../GridP2PContinuousDeploymentSelfTest.java | 70 +- .../platform/PlatformCacheWriteMetricsTask.java | 55 + .../testframework/junits/GridAbstractTest.java | 95 +- .../junits/common/GridCommonAbstractTest.java | 117 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 12 +- .../IgniteBasicWithPersistenceTestSuite.java | 67 + ...IgniteBinaryObjectsComputeGridTestSuite.java | 3 + .../IgniteCacheEvictionSelfTestSuite.java | 3 - .../IgniteCacheFullApiSelfTestSuite.java | 3 + .../IgniteCacheMetricsSelfTestSuite.java | 6 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 8 +- .../testsuites/IgniteCacheTestSuite2.java | 5 +- .../testsuites/IgniteCacheTestSuite3.java | 9 +- .../testsuites/IgniteCacheTestSuite4.java | 5 +- .../testsuites/IgniteCacheTestSuite5.java | 6 +- .../testsuites/IgniteCacheTestSuite6.java | 27 +- .../testsuites/IgniteCacheTestSuite7.java | 53 +- .../testsuites/IgniteComputeGridTestSuite.java | 2 - .../testsuites/IgniteKernalSelfTestSuite.java | 7 +- .../IgniteMarshallerSelfTestSuite.java | 5 +- .../testsuites/IgniteUtilSelfTestSuite.java | 7 +- .../ignite/util/GridCommandHandlerTest.java | 178 +- .../GridInternalTaskUnusedWalSegmentsTest.java | 27 +- .../apache/ignite/sink/flink/IgniteSink.java | 88 +- .../sink/flink/FlinkIgniteSinkSelfTest.java | 154 +- .../flink/src/test/resources/example-ignite.xml | 7 +- modules/gce/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 85 +- .../query/h2/ddl/DdlStatementsProcessor.java | 28 +- .../query/h2/dml/UpdatePlanBuilder.java | 15 +- .../query/h2/opt/GridH2IndexBase.java | 31 +- .../query/h2/sql/GridSqlQuerySplitter.java | 12 +- .../processors/query/h2/sys/SqlSystemIndex.java | 143 ++ .../processors/query/h2/sys/SqlSystemTable.java | 208 ++ .../query/h2/sys/SqlSystemTableEngine.java | 60 + .../h2/sys/view/SqlAbstractLocalSystemView.java | 104 + .../h2/sys/view/SqlAbstractSystemView.java | 134 ++ .../query/h2/sys/view/SqlSystemView.java | 79 + .../sys/view/SqlSystemViewColumnCondition.java | 102 + .../query/h2/sys/view/SqlSystemViewNodes.java | 116 + .../query/h2/twostep/GridMapQueryExecutor.java | 75 +- .../h2/twostep/GridReduceQueryExecutor.java | 140 +- .../processors/cache/BigEntryQueryTest.java | 150 ++ ...butedPartitionQueryNodeRestartsSelfTest.java | 21 +- ...QueryNodeRestartDistributedJoinSelfTest.java | 10 + ...ngBaselineCacheQueryNodeRestartSelfTest.java | 2 + ...eBaselineCacheQueryNodeRestartsSelfTest.java | 2 + .../query/SqlSystemViewsSelfTest.java | 247 +++ .../IgniteBinaryCacheQueryTestSuite.java | 2 + .../IgniteCacheQuerySelfTestSuite.java | 2 + ...acheWithIndexingAndPersistenceTestSuite.java | 38 + .../IgniteCacheWithIndexingTestSuite.java | 6 +- modules/kafka/pom.xml | 12 +- .../ignite/stream/kafka/KafkaStreamer.java | 173 +- .../kafka/KafkaIgniteStreamerSelfTest.java | 39 +- .../ignite/stream/kafka/TestKafkaBroker.java | 18 +- modules/kubernetes/pom.xml | 8 +- .../TcpDiscoveryKubernetesIpFinder.java | 4 +- .../ignite/ml/selection/cv/CrossValidation.java | 212 +- .../ml/selection/cv/CrossValidationResult.java | 134 ++ .../ml/selection/paramgrid/ParamGrid.java | 58 + .../paramgrid/ParameterSetGenerator.java | 91 + .../ml/selection/paramgrid/package-info.java | 22 + .../org/apache/ignite/ml/tree/DecisionTree.java | 6 +- .../tree/DecisionTreeClassificationTrainer.java | 38 + .../ignite/ml/selection/SelectionTestSuite.java | 2 + .../paramgrid/ParameterSetGeneratorTest.java | 56 + .../osgi-karaf/src/main/resources/features.xml | 10 +- .../cpp/core-test/src/continuous_query_test.cpp | 6 +- .../Cache/CacheMetricsTest.cs | 11 + .../Continuous/ContinuousQueryAbstractTest.cs | 10 +- .../Apache.Ignite.Core/Cache/ICacheMetrics.cs | 88 + .../Impl/Cache/CacheMetricsImpl.cs | 79 +- .../Impl/Cache/Event/CacheEntryRemoveEvent.cs | 4 +- .../Query/Continuous/ContinuousQueryUtils.cs | 2 +- modules/rest-http/pom.xml | 6 +- modules/spark/pom.xml | 6 - modules/tensorflow/README.txt | 55 +- modules/tensorflow/pom.xml | 56 +- modules/tensorflow/src/main/assembly/zip.xml | 56 + .../cluster/TensorFlowClusterGateway.java | 34 +- .../TensorFlowClusterGatewayManager.java | 95 +- .../cluster/TensorFlowClusterMaintainer.java | 105 +- .../cluster/TensorFlowClusterManager.java | 268 ++- .../cluster/TensorFlowJobArchive.java | 65 + .../cluster/spec/TensorFlowClusterSpec.java | 39 + .../spec/TensorFlowServerAddressSpec.java | 14 + .../tfrunning/TensorFlowServerManager.java | 112 +- .../TensorFlowServerScriptFormatter.java | 62 + .../cluster/util/ClusterPortManager.java | 168 +- .../cluster/util/TensorFlowChiefRunner.java | 80 + .../cluster/util/TensorFlowClusterResolver.java | 92 +- .../util/TensorFlowUserScriptRunner.java | 236 +++ .../ignite/tensorflow/core/ProcessManager.java | 5 +- .../tensorflow/core/ProcessManagerWrapper.java | 5 +- .../longrunning/LongRunningProcessManager.java | 19 +- .../task/LongRunningProcessStartTask.java | 4 +- .../core/nativerunning/NativeProcess.java | 6 +- .../nativerunning/NativeProcessManager.java | 12 +- .../task/NativeProcessStartTask.java | 81 +- .../PythonProcessBuilderSupplier.java | 57 + .../pythonrunning/PythonProcessManager.java | 35 +- .../core/util/AsyncNativeProcessRunner.java | 107 + .../core/util/NativeProcessRunner.java | 133 ++ .../tensorflow/submitter/JobSubmitter.java | 35 + .../submitter/command/AbstractCommand.java | 55 + .../submitter/command/AttachCommand.java | 51 + .../tensorflow/submitter/command/PsCommand.java | 47 + .../submitter/command/RootCommand.java | 42 + .../submitter/command/StartCommand.java | 205 ++ .../submitter/command/StopCommand.java | 50 + .../submitter/command/package-info.java | 22 + .../tensorflow/submitter/package-info.java | 23 + .../tensorflow/util/SerializableConsumer.java | 29 + .../tensorflow/util/SerializableSupplier.java | 29 + .../ignite/tensorflow/util/package-info.java | 22 + modules/tensorflow/src/main/sh/ignite-tf.sh | 19 + modules/tensorflow/src/main/sh/logback.xml | 36 + .../LongRunningProcessManagerTest.java | 10 +- modules/web-console/e2e/docker-compose.yml | 2 +- .../testcafe/components/pageConfiguration.js | 2 +- .../configuration/clusterFormChangeDetection.js | 12 +- .../PageConfigurationAdvancedCluster.js | 11 + modules/web-console/frontend/app/app.js | 10 + .../frontend/app/browserUpdate/index.js | 8 +- .../app/components/bs-select-menu/index.js | 6 +- .../components/bs-select-menu/strip.filter.js | 22 + .../app/components/bs-select-menu/template.pug | 2 +- .../transcludeToBody.directive.js | 2 +- .../components/cluster-selector/controller.js | 13 +- .../components/cluster-selector/template.pug | 8 +- .../form-field/showValidationError.directive.js | 6 +- .../grid-column-selector/controller.js | 8 +- .../app/components/grid-export/index.js | 2 +- .../app/components/grid-export/style.scss | 34 + .../app/components/grid-export/template.pug | 6 +- .../components/grid-item-selected/template.pug | 5 +- .../app/components/grid-no-data/controller.js | 7 +- .../components/grid-showing-rows/component.js | 29 + .../components/grid-showing-rows/controller.js | 47 + .../app/components/grid-showing-rows/index.js | 24 + .../app/components/grid-showing-rows/style.scss | 20 + .../ignite-chart-series-selector/component.js | 28 + .../ignite-chart-series-selector/controller.js | 62 + .../ignite-chart-series-selector/index.js | 24 + .../ignite-chart-series-selector/template.pug | 29 + .../app/components/ignite-chart/controller.js | 320 +++ .../app/components/ignite-chart/index.js | 38 + .../app/components/ignite-chart/style.scss | 69 + .../app/components/ignite-chart/template.pug | 36 + .../list-editable-save-on-changes/directives.js | 14 +- .../list-editable-transclude/directive.js | 12 +- .../app/components/list-editable/controller.js | 6 +- .../components/cluster-edit-form/controller.js | 2 - .../templates/load-balancing.pug | 2 +- .../cluster-edit-form/templates/memory.pug | 2 +- .../cluster-edit-form/templates/swap.pug | 2 +- .../components/model-edit-form/controller.js | 10 +- .../page-configure-basic/controller.js | 13 +- .../pco-grid-column-categories/directive.js | 4 +- .../components/formUICanExitGuard.js | 12 +- .../components/modal-import-models/component.js | 23 +- .../tables-action-cell/component.js | 14 +- .../modal-preview-project/controller.js | 10 +- .../components/pc-form-field-size/controller.js | 8 +- .../components/pc-items-table/controller.js | 26 +- .../components/pc-ui-grid-filters/directive.js | 4 +- .../components/pc-ui-grid-filters/index.js | 5 +- .../components/pcIsInCollection.js | 4 +- .../page-configure/components/pcValidation.js | 8 +- .../app/components/page-configure/index.js | 14 +- .../app/components/page-configure/reducer.js | 90 +- .../page-configure/services/ConfigureState.js | 5 + .../app/components/page-configure/states.js | 88 +- .../components/page-configure/store/effects.js | 114 +- .../page-configure/store/selectors.js | 50 +- .../transitionHooks/errorState.js | 5 +- .../components/page-password-changed/style.scss | 2 +- .../components/queries-notebook/controller.js | 33 +- .../queries-notebook/template.tpl.pug | 4 +- .../queries-notebooks-list/controller.js | 4 +- .../app/components/page-queries/index.js | 2 + .../app/components/page-queries/style.scss | 20 + .../frontend/app/components/page-signin/run.js | 5 +- .../components/panel-collapsible/controller.js | 19 +- .../app/components/ui-grid-filters/directive.js | 3 +- .../app/components/ui-grid-filters/index.js | 4 +- .../frontend/app/filters/bytes.filter.js | 34 + .../frontend/app/filters/bytes.filter.spec.js | 36 + .../generator/ConfigurationGenerator.js | 3 +- .../field/bs-select-placeholder.directive.js | 4 +- .../modules/form/validator/unique.directive.js | 6 +- .../modules/nodes/nodes-dialog.controller.js | 6 +- .../app/modules/nodes/nodes-dialog.scss | 17 +- .../app/modules/nodes/nodes-dialog.tpl.pug | 28 +- .../frontend/app/primitives/btn/index.scss | 9 + .../app/primitives/form-field/checkbox.pug | 2 +- .../app/primitives/form-field/index.scss | 46 +- .../app/primitives/form-field/number.pug | 5 +- .../web-console/frontend/app/services/Caches.js | 10 +- .../frontend/app/services/Clusters.js | 38 +- .../app/services/ErrorParser.service.js | 89 + .../frontend/app/services/FormUtils.service.js | 13 +- .../web-console/frontend/app/services/IGFSs.js | 8 +- .../frontend/app/services/Messages.service.js | 29 +- .../web-console/frontend/app/services/Models.js | 17 +- .../frontend/app/services/exceptionHandler.js | 4 +- modules/web-console/frontend/package.json | 4 +- .../frontend/public/stylesheets/style.scss | 23 +- .../frontend/public/stylesheets/variables.scss | 6 +- .../frontend/views/sql/cache-metadata.tpl.pug | 3 +- .../frontend/views/sql/chart-settings.tpl.pug | 2 +- modules/web-console/web-agent/pom.xml | 2 +- .../ignite/console/agent/AgentLauncher.java | 6 +- .../console/agent/handlers/ClusterListener.java | 7 + modules/zookeeper/pom.xml | 10 +- .../zk/TcpDiscoveryZookeeperIpFinder.java | 2 +- .../zk/ZookeeperDiscoverySpiTestSuite1.java | 1 + .../zk/ZookeeperDiscoverySpiTestSuite2.java | 3 + .../zk/internal/ZookeeperDiscoverySpiTest.java | 128 +- parent/pom.xml | 5 +- 321 files changed, 10710 insertions(+), 4227 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa1a33ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa1a33ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa1a33ec/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java index 1f498d0,7a5aa80..0b259f9 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java @@@ -54,9 -44,7 +44,10 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnTimeoutNoDeadlockDetectionTest; import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnTimeoutTest; import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnTopologyChangeTest; +import org.apache.ignite.internal.processors.cache.transactions.TxRollbackOnIncorrectParamsTest; +import org.apache.ignite.internal.processors.cache.transactions.TxStateChangeEventTest; +import org.apache.ignite.internal.processors.cache.transactions.TxWithSmallTimeoutAndContentionOneKeyTest; + import org.apache.ignite.testframework.junits.GridAbstractTest; /** * Test suite.
