ignite git commit: IGNITE-8808 Improve control.sh --tx command to show local and remote transactions. - Fixes #4209.

2018-06-19 Thread agoncharuk 
Repository: ignite
Updated Branches:
  refs/heads/master cf09e7691 -> d305c6634


IGNITE-8808 Improve control.sh --tx command to show local and remote 
transactions. - Fixes #4209.

Signed-off-by: Alexey Goncharuk 


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

Branch: refs/heads/master
Commit: d305c6634032c152fd2432a31f465e0083c715a2
Parents: cf09e76
Author: Aleksei Scherbakov 
Authored: Tue Jun 19 20:12:13 2018 +0300
Committer: Alexey Goncharuk 
Committed: Tue Jun 19 20:12:13 2018 +0300

--
 .../internal/commandline/CommandHandler.java|  18 +-
 .../ignite/internal/visor/tx/VisorTxInfo.java   |  41 ++-
 .../ignite/internal/visor/tx/VisorTxTask.java   | 212 +++--
 .../internal/TestRecordingCommunicationSpi.java |  42 ++-
 .../ignite/util/GridCommandHandlerTest.java | 303 ++-
 5 files changed, 559 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d305c663/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
index ed85f0c..cf05699 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -1088,11 +1088,19 @@ public class CommandHandler {
 ", concurrency=" + info.getConcurrency() +
 ", timeout=" + info.getTimeout() +
 ", size=" + info.getSize() +
-", dhtNodes=" + F.transform(info.getPrimaryNodes(), 
new IgniteClosure() {
-@Override public String apply(UUID id) {
-return U.id8(id);
-}
-}) +
+", dhtNodes=" + (info.getPrimaryNodes() == null ? 
"N/A" :
+F.transform(info.getPrimaryNodes(), new 
IgniteClosure() {
+@Override public String apply(UUID id) {
+return U.id8(id);
+}
+})) +
+", nearXid=" + info.getNearXid() +
+", parentNodeIds=" + (info.getMasterNodeIds() == null 
? "N/A" :
+F.transform(info.getMasterNodeIds(), new 
IgniteClosure() {
+@Override public String apply(UUID id) {
+return U.id8(id);
+}
+})) +
 ']');
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/d305c663/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
index ecf3e0d..03de5b0 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/visor/tx/VisorTxInfo.java
@@ -33,6 +33,7 @@ import org.apache.ignite.lang.IgniteUuid;
 import org.apache.ignite.transactions.TransactionConcurrency;
 import org.apache.ignite.transactions.TransactionIsolation;
 import org.apache.ignite.transactions.TransactionState;
+import org.jetbrains.annotations.Nullable;
 
 /**
  */
@@ -75,6 +76,12 @@ public class VisorTxInfo extends VisorDataTransferObject {
 /** */
 private int size;
 
+/** */
+private IgniteUuid nearXid;
+
+/** */
+private Collection masterNodeIds;
+
 /**
  * Default constructor.
  */
@@ -96,7 +103,7 @@ public class VisorTxInfo extends VisorDataTransferObject {
  */
 public VisorTxInfo(IgniteUuid xid, long startTime, long duration, 
TransactionIsolation isolation,
 TransactionConcurrency concurrency, long timeout, String lb, 
Collection primaryNodes,
-TransactionState state, int size) {
+TransactionState state, int size, IgniteUuid nearXid, Collection 
masterNodeIds) {
 this.xid = xid;
 this.startTime = startTime;
 this.duration = duration;
@@ -107,6 +114,13 @@ public class VisorTxInfo extends VisorDataTransferObject {
 this.primaryNodes = primaryNodes;
 this.state =

ignite git commit: IGNITE-8554 Cache metrics: expose metrics with rebalance info about keys - Fixes #4094.

2018-06-19 Thread irakov 
Repository: ignite
Updated Branches:
  refs/heads/master 49a565cee -> cf09e7691


IGNITE-8554 Cache metrics: expose metrics with rebalance info about keys - 
Fixes #4094.

Signed-off-by: Ivan Rakov 


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

Branch: refs/heads/master
Commit: cf09e76916c38f867cd5cb618e345c74672026db
Parents: 49a565c
Author: Ilya Lantukh 
Authored: Tue Jun 19 18:10:48 2018 +0300
Committer: Ivan Rakov 
Committed: Tue Jun 19 18:10:48 2018 +0300

--
 .../org/apache/ignite/cache/CacheMetrics.java   | 10 +++
 .../cache/CacheAffinitySharedManager.java   |  3 +-
 .../cache/CacheClusterMetricsMXBeanImpl.java| 10 +++
 .../cache/CacheLocalMetricsMXBeanImpl.java  |  8 ++
 .../processors/cache/CacheMetricsImpl.java  | 15 +++-
 .../processors/cache/CacheMetricsSnapshot.java  | 30 
 .../GridCachePartitionExchangeManager.java  | 13 +++-
 .../dht/GridClientPartitionTopology.java| 35 +
 .../dht/GridDhtPartitionTopology.java   | 11 +++
 .../dht/GridDhtPartitionTopologyImpl.java   | 34 +
 .../dht/preloader/GridDhtPartitionDemander.java | 28 ---
 .../GridDhtPartitionSupplyMessage.java  |  9 +--
 .../GridDhtPartitionsExchangeFuture.java| 60 +--
 .../preloader/GridDhtPartitionsFullMessage.java | 80 ++--
 .../GridDhtPartitionsSingleMessage.java | 24 +++---
 .../platform/cache/PlatformCache.java   |  2 +
 .../internal/visor/cache/VisorCacheMetrics.java | 35 +
 .../visor/node/VisorNodeDataCollectorJob.java   | 20 -
 .../cache/CacheGroupsMetricsRebalanceTest.java  | 50 ++--
 .../platform/PlatformCacheWriteMetricsTask.java | 10 +++
 .../Apache.Ignite.Core/Cache/ICacheMetrics.cs   | 18 +
 .../Impl/Cache/CacheMetricsImpl.cs  | 14 
 22 files changed, 446 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/cf09e769/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
index 99bf2c2..e3e6446 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java
@@ -509,6 +509,16 @@ public interface CacheMetrics {
 public int getRebalancingPartitionsCount();
 
 /**
+ * @return Number of already rebalanced keys.
+ */
+public long getRebalancedKeys();
+
+/**
+ * @return Number estimated to rebalance keys.
+ */
+public long getEstimatedRebalancingKeys();
+
+/**
  * @return Estimated number of keys to be rebalanced on current node.
  */
 public long getKeysToRebalanceLeft();

http://git-wip-us.apache.org/repos/asf/ignite/blob/cf09e769/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 92b8d3e..08eb43f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -472,6 +472,7 @@ public class CacheAffinitySharedManager extends 
GridCacheSharedManagerAdap
 clientTop.partitionMap(true),
 clientTop.fullUpdateCounters(),
 Collections.emptySet(),
+null,
 null);
 }
 
@@ -530,7 +531,7 @@ public class CacheAffinitySharedManager extends 
GridCacheSharedManagerAdap
 
 grp.topology().updateTopologyVersion(topFut, discoCache, -1, 
false);
 
-grp.topology().update(topVer, partMap, null, 
Collections.emptySet(), null);
+grp.topology().update(topVer, partMap, null, 
Collections.emptySet(), null, null);
 
 topFut.validate(grp, discoCache.allNodes());
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/cf09e769/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClusterMetricsMXBeanImpl.java

ignite git commit: IGNITE-8798 Move transaction recovery logging to INFO level

2018-06-19 Thread irakov 
Repository: ignite
Updated Branches:
  refs/heads/master b37f8a207 -> 49a565cee


IGNITE-8798 Move transaction recovery logging to INFO level

Signed-off-by: Ivan Rakov 


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

Branch: refs/heads/master
Commit: 49a565cee5f8bcb890602c493e20cf145bfb5e9b
Parents: b37f8a2
Author: ezagumennov 
Authored: Tue Jun 19 18:04:34 2018 +0300
Committer: Ivan Rakov 
Committed: Tue Jun 19 18:04:34 2018 +0300

--
 .../distributed/GridCacheTxRecoveryFuture.java  | 112 ++-
 .../cache/transactions/IgniteTxHandler.java |   8 +-
 .../cache/transactions/IgniteTxManager.java |  20 ++--
 3 files changed, 72 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/49a565ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
index d6b45b3..3eeb0db 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
@@ -120,8 +120,8 @@ public class GridCacheTxRecoveryFuture extends 
GridCacheCompoundIdentityFuturehttp://git-wip-us.apache.org/repos/asf/ignite/blob/49a565ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 44482ab..6bfa1e8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -1877,8 +1877,8 @@ public class IgniteTxHandler {
  * @param res Response.
  */
 protected void processCheckPreparedTxResponse(UUID nodeId, 
GridCacheTxRecoveryResponse res) {
-if (txRecoveryMsgLog.isDebugEnabled()) {
-txRecoveryMsgLog.debug("Received tx recovery response [txId=" + 
res.version() +
+if (txRecoveryMsgLog.isInfoEnabled()) {
+txRecoveryMsgLog.info("Received tx recovery response [txId=" + 
res.version() +
 ", node=" + nodeId +
 ", res=" + res + ']');
 }
@@ -1886,8 +1886,8 @@ public class IgniteTxHandler {
 GridCacheTxRecoveryFuture fut = 
(GridCacheTxRecoveryFuture)ctx.mvcc().future(res.futureId());
 
 if (fut == null) {
-if (txRecoveryMsgLog.isDebugEnabled()) {
-txRecoveryMsgLog.debug("Failed to find future for tx recovery 
response [txId=" + res.version() +
+if (txRecoveryMsgLog.isInfoEnabled()) {
+txRecoveryMsgLog.info("Failed to find future for tx recovery 
response [txId=" + res.version() +
 ", node=" + nodeId + ", res=" + res + ']');
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/49a565ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 86360b6..a30ca04 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -383,16 +383,16 @@ public class IgniteTxManager extends 
GridCacheSharedManagerAdapter {
 
 if (state == ACTIVE || state == PREPARING || state == PREPARED || 
state == MARKED_ROLLBACK) {
 if (!tx.markFinalizing(status)) {
-if (log.isDebugEnabled())
-log.debug("Will not try to commit invalidate transaction 
(could not mark finalized): " + tx);
+if (log.isInfoEnabled())
+log.info("Will not

ignite git commit: IGNITE-8769 JVM crash in Basic1 suite in master branch on TC - Fixes #4206.

2018-06-19 Thread irakov 
Repository: ignite
Updated Branches:
  refs/heads/master 098b03b92 -> b37f8a207


IGNITE-8769 JVM crash in Basic1 suite in master branch on TC - Fixes #4206.

Signed-off-by: Ivan Rakov 


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

Branch: refs/heads/master
Commit: b37f8a207d881f4f1f88c0217fd5b96cb2e3b418
Parents: 098b03b
Author: Dmitriy Sorokin 
Authored: Tue Jun 19 15:35:51 2018 +0300
Committer: Ivan Rakov 
Committed: Tue Jun 19 15:35:51 2018 +0300

--
 .../cache/persistence/freelist/PagesList.java   | 23 +++-
 1 file changed, 18 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b37f8a20/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
index 905507e..7f55a70 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
@@ -637,8 +637,19 @@ public abstract class PagesList extends DataStructure {
 continue;
 }
 
-assert PageIO.getPageId(tailAddr) == tailId : "pageId = " + 
PageIO.getPageId(tailAddr) + ", tailId = " + tailId;
-assert PageIO.getType(tailAddr) == PageIO.T_PAGE_LIST_NODE;
+if (stripe.tailId != tailId) {
+// Another thread took the last page.
+writeUnlock(tailId, tailPage, tailAddr, false);
+
+lockAttempt--; // Ignore current attempt.
+
+continue;
+}
+
+assert PageIO.getPageId(tailAddr) == tailId
+: "tailId = " + U.hexLong(tailId) + ", pageId = " + 
U.hexLong(PageIO.getPageId(tailAddr));
+assert PageIO.getType(tailAddr) == PageIO.T_PAGE_LIST_NODE
+: "tailId = " + U.hexLong(tailId) + ", type = " + 
PageIO.getType(tailAddr);
 
 boolean ok = false;
 
@@ -1036,7 +1047,7 @@ public abstract class PagesList extends DataStructure {
 if (tailAddr == 0L)
 continue;
 
-if (stripe.empty) {
+if (stripe.empty || stripe.tailId != tailId) {
 // Another thread took the last page.
 writeUnlock(tailId, tailPage, tailAddr, false);
 
@@ -1049,8 +1060,10 @@ public abstract class PagesList extends DataStructure {
 return 0L;
 }
 
-assert PageIO.getPageId(tailAddr) == tailId : "tailId = " + 
tailId + ", tailPageId = " + PageIO.getPageId(tailAddr);
-assert PageIO.getType(tailAddr) == PageIO.T_PAGE_LIST_NODE;
+assert PageIO.getPageId(tailAddr) == tailId
+: "tailId = " + U.hexLong(tailId) + ", pageId = " + 
U.hexLong(PageIO.getPageId(tailAddr));
+assert PageIO.getType(tailAddr) == PageIO.T_PAGE_LIST_NODE
+: "tailId = " + U.hexLong(tailId) + ", type = " + 
PageIO.getType(tailAddr);
 
 boolean dirty = false;
 long dataPageId;

ignite git commit: IGNITE-8704 CacheManagerTest.getUnsafeTypedCacheRequest failed

2018-06-19 Thread av 
Repository: ignite
Updated Branches:
  refs/heads/master 29599901c -> 098b03b92


IGNITE-8704 CacheManagerTest.getUnsafeTypedCacheRequest failed

Signed-off-by: Anton Vinogradov 


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

Branch: refs/heads/master
Commit: 098b03b92c5abe40571e690a240e8153dd8054e4
Parents: 2959990
Author: Alexander Menshikov 
Authored: Tue Jun 19 14:37:50 2018 +0300
Committer: Anton Vinogradov 
Committed: Tue Jun 19 14:37:50 2018 +0300

--
 .../main/java/org/apache/ignite/cache/CacheManager.java | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/098b03b9/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index a5dd9b0..b376755 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -219,17 +219,7 @@ public class CacheManager implements 
javax.cache.CacheManager {
 kernalGateway.readLock();
 
 try {
-IgniteCache cache = getCache0(cacheName);
-
-if (cache != null) {
-if(cache.getConfiguration(Configuration.class).getKeyType() != 
Object.class)
-throw new IllegalArgumentException();
-
-if(cache.getConfiguration(Configuration.class).getValueType() 
!= Object.class)
-throw new IllegalArgumentException();
-}
-
-return cache;
+return getCache0(cacheName);
 }
 finally {
 kernalGateway.readUnlock();

ignite git commit: IGNITE-8749 Exception for no space left situation should be propagated to FailureHandler - rollback

2018-06-19 Thread irakov 
Repository: ignite
Updated Branches:
  refs/heads/master 88b299fab -> 29599901c


IGNITE-8749 Exception for no space left situation should be propagated to 
FailureHandler - rollback


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

Branch: refs/heads/master
Commit: 29599901cd6bcd5a8aec003edc1538dbd66530af
Parents: 88b299f
Author: Ivan Rakov 
Authored: Tue Jun 19 12:31:02 2018 +0300
Committer: Ivan Rakov 
Committed: Tue Jun 19 12:32:32 2018 +0300

--
 .../wal/FileWriteAheadLogManager.java   | 167 ++--
 .../wal/FsyncModeFileWriteAheadLogManager.java  | 215 +++-
 .../ignite/failure/TestFailureHandler.java  |  19 --
 .../db/wal/IgniteWalFormatFileFailoverTest.java | 258 ---
 .../ignite/testsuites/IgnitePdsTestSuite2.java  |   3 -
 5 files changed, 179 insertions(+), 483 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/29599901/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
index 4654b90..5703d17 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
@@ -604,43 +604,48 @@ public class FileWriteAheadLogManager extends 
GridCacheSharedManagerAdapter impl
 
 /** {@inheritDoc} */
 @Override public void resumeLogging(WALPointer lastPtr) throws 
IgniteCheckedException {
-assert currHnd == null;
-assert lastPtr == null || lastPtr instanceof FileWALPointer;
+try {
+assert currHnd == null;
+assert lastPtr == null || lastPtr instanceof FileWALPointer;
 
-FileWALPointer filePtr = (FileWALPointer)lastPtr;
+FileWALPointer filePtr = (FileWALPointer)lastPtr;
 
 walWriter = new WALWriter(log);
 
 if (!mmap)
 new IgniteThread(walWriter).start();
 
-currHnd = restoreWriteHandle(filePtr);
+currHnd = restoreWriteHandle(filePtr);
 
-// For new handle write serializer version to it.
-if (filePtr == null)
-currHnd.writeHeader();
+// For new handle write serializer version to it.
+if (filePtr == null)
+currHnd.writeHeader();
 
-if (currHnd.serializer.version() != serializer.version()) {
-if (log.isInfoEnabled())
-log.info("Record serializer version change detected, will 
start logging with a new WAL record " +
-"serializer to a new WAL segment [curFile=" + currHnd + ", 
newVer=" + serializer.version() +
-", oldVer=" + currHnd.serializer.version() + ']');
+if (currHnd.serializer.version() != serializer.version()) {
+if (log.isInfoEnabled())
+log.info("Record serializer version change detected, will 
start logging with a new WAL record " +
+"serializer to a new WAL segment [curFile=" + currHnd 
+ ", newVer=" + serializer.version() +
+", oldVer=" + currHnd.serializer.version() + ']');
 
-rollOver(currHnd);
-}
+rollOver(currHnd);
+}
 
-currHnd.resume = false;
+currHnd.resume = false;
 
-if (mode == WALMode.BACKGROUND) {
-backgroundFlushSchedule = cctx.time().schedule(new Runnable() {
-@Override public void run() {
-doFlush();
-}
-}, flushFreq, flushFreq);
-}
+if (mode == WALMode.BACKGROUND) {
+backgroundFlushSchedule = cctx.time().schedule(new Runnable() {
+@Override public void run() {
+doFlush();
+}
+}, flushFreq, flushFreq);
+}
 
-if (walAutoArchiveAfterInactivity > 0)
-scheduleNextInactivityPeriodElapsedCheck();
+if (walAutoArchiveAfterInactivity > 0)
+scheduleNextInactivityPeriodElapsedCheck();
+}
+catch (StorageException e) {
+throw new IgniteCheckedException(e);
+}
 }
 
 /**
@@ -1125,9 +1130,9 @@ public c

ignite git commit: IGNITE-8708 CacheManagerTest.close_cachesEmpty failed

2018-06-19 Thread av 
Repository: ignite
Updated Branches:
  refs/heads/master bde1941b0 -> 88b299fab


IGNITE-8708 CacheManagerTest.close_cachesEmpty failed

Signed-off-by: Anton Vinogradov 


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

Branch: refs/heads/master
Commit: 88b299fab9a4f23281a59532d366699a2988f1dd
Parents: bde1941
Author: Alexander Menshikov 
Authored: Tue Jun 19 12:28:31 2018 +0300
Committer: Anton Vinogradov 
Committed: Tue Jun 19 12:28:31 2018 +0300

--
 .../core/src/main/java/org/apache/ignite/cache/CacheManager.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/88b299fa/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java 
b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index b572dd5..a5dd9b0 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -258,8 +258,7 @@ public class CacheManager implements 
javax.cache.CacheManager {
 
 try {
 if (kernalGateway.getState() != GridKernalState.STARTED)
-return Collections.emptySet(); // javadoc of #getCacheNames() 
says that IllegalStateException should be
-   // thrown but 
CacheManagerTest.close_cachesEmpty() require empty collection.
+throw new IllegalStateException();
 
 Collection res = new ArrayList<>();

ignite git commit: IGNITE-8826: Added missed licence

2018-06-19 Thread chief 
Repository: ignite
Updated Branches:
  refs/heads/master a8112fbfd -> bde1941b0


IGNITE-8826: Added missed licence

this closes #4222


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

Branch: refs/heads/master
Commit: bde1941b002637eced2cfa9e197a6446987ece52
Parents: a8112fb
Author: YuriBabak 
Authored: Tue Jun 19 11:49:19 2018 +0300
Committer: Yury Babak 
Committed: Tue Jun 19 11:49:19 2018 +0300

--
 modules/tensorflow/licences/apache-2.0.txt | 202 
 modules/tensorflow/pom.xml |  20 +++
 2 files changed, 222 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bde1941b/modules/tensorflow/licences/apache-2.0.txt
--
diff --git a/modules/tensorflow/licences/apache-2.0.txt 
b/modules/tensorflow/licences/apache-2.0.txt
new file mode 100644
index 000..d645695
--- /dev/null
+++ b/modules/tensorflow/licences/apache-2.0.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Co

ignite git commit: IGNITE-8506 Visor CMD: Added output of node "Consistent ID".

2018-06-19 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/master 61b38977f -> a8112fbfd


IGNITE-8506 Visor CMD: Added output of node "Consistent ID".


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

Branch: refs/heads/master
Commit: a8112fbfd73573f32f252071ad19c733bf46123d
Parents: 61b3897
Author: Vasiliy Sisko 
Authored: Tue Jun 19 14:55:43 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Jun 19 14:55:43 2018 +0700

--
 .../commands/config/VisorConfigurationCommand.scala   |  2 +-
 .../ignite/visor/commands/node/VisorNodeCommand.scala |  1 +
 .../visor/commands/top/VisorTopologyCommand.scala | 14 +-
 .../main/scala/org/apache/ignite/visor/visor.scala|  3 ++-
 4 files changed, 13 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a8112fbf/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
--
diff --git 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index 1a82381..86a6a59 100644
--- 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++ 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -154,7 +154,7 @@ class VisorConfigurationCommand extends VisorConsoleCommand 
{
 cmnT += ("Grid name", escapeName(basic.getIgniteInstanceName))
 cmnT += ("Ignite home", safe(basic.getGgHome))
 cmnT += ("Localhost", safe(basic.getLocalHost))
-cmnT += ("Consistent ID", safe(basic.getConsistentId))
+cmnT += ("Consistent ID", safe(basic.getConsistentId, ""))
 cmnT += ("Marshaller", basic.getMarshaller)
 cmnT += ("Deployment mode", safe(basic.getDeploymentMode))
 cmnT += ("ClientMode", javaBoolToStr(basic.isClientMode))

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8112fbf/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
--
diff --git 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
index 6e1a339..861ed5d 100644
--- 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
+++ 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
@@ -206,6 +206,7 @@ class VisorNodeCommand extends VisorConsoleCommand {
 
 t += ("ID", node.id)
 t += ("ID8", nid8(node))
+t += ("Consistent ID", node.consistentId())
 t += ("Node Type", if (node.isClient) "Client" else 
"Server")
 t += ("Order", node.order)
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8112fbf/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
--
diff --git 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
index 79858ee..094239a 100644
--- 
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
+++ 
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
@@ -149,9 +149,9 @@ class VisorTopologyCommand extends VisorConsoleCommand {
 val argLst = parseArgs(args)
 
 if (hasArgFlag("activate", argLst))
-ignite.active(true)
+ignite.cluster().active(true)
 else if (hasArgFlag("deactivate", argLst))
-ignite.active(false)
+ignite.cluster().active(false)
 else {
 val hosts = argLst.filter(_._1 == "h").map((a: Arg) =>
 try
@@ -242,7 +242,7 @@ class VisorTopologyCommand extends VisorConsoleCommand {
 if (all) {
 val nodesT = VisorTextTable()
 
-nodesT #= ("Node ID8(@), IP", "Start Time", "Up Time",
+nodesT #= ("Node ID8(@), IP", "Consistent ID", "Start Time", "Up 
Time",