You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/10/21 03:53:55 UTC
[1/5] ignite git commit: Muted test
IgniteCacheClientNodeChangingTopologyTest.testAtomicClockPutAllMultinode
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 bd7b27d3f -> 60d850009
Muted test IgniteCacheClientNodeChangingTopologyTest.testAtomicClockPutAllMultinode
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75fb19de
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75fb19de
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75fb19de
Branch: refs/heads/ignite-843-rc1
Commit: 75fb19deec4a4dfec8d93a27008faa1c90ebb780
Parents: 10ef06a
Author: ashutak <as...@gridgain.com>
Authored: Tue Oct 20 13:32:43 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Oct 20 13:32:43 2015 +0300
----------------------------------------------------------------------
.../distributed/IgniteCacheClientNodeChangingTopologyTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/75fb19de/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
index 1b3dc7a..b6e86f2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java
@@ -1413,6 +1413,8 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testAtomicClockPutAllMultinode() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1685");
+
multinode(CLOCK, TestType.PUT_ALL);
}
@@ -1840,4 +1842,4 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac
/** */
LOCK
}
-}
\ No newline at end of file
+}
[2/5] ignite git commit: IGNITE-1740: Node id in IGFS file lock id.
Posted by ak...@apache.org.
IGNITE-1740: Node id in IGFS file lock id.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f619e094
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f619e094
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f619e094
Branch: refs/heads/ignite-843-rc1
Commit: f619e094356959cf749243989e3c3c17daf93d50
Parents: 75fb19d
Author: iveselovskiy <iv...@gridgain.com>
Authored: Tue Oct 20 15:49:21 2015 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Tue Oct 20 15:49:21 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/igfs/IgfsMetaManager.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f619e094/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index c016e46..e75fe51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -526,7 +526,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return New file info with lock set, or null if the info passed in is already locked.
* @throws IgniteCheckedException In case lock is already set on that file.
*/
- private static @Nullable IgfsFileInfo lockInfo(IgfsFileInfo info, boolean isDeleteLock) {
+ private @Nullable IgfsFileInfo lockInfo(IgfsFileInfo info, boolean isDeleteLock) {
assert info != null;
if (info.lockId() != null)
@@ -537,12 +537,16 @@ public class IgfsMetaManager extends IgfsManager {
/**
* Gets a new lock id.
+ * The returned Id #globalId() method will return the Id of the node which locked the file.
*
* @param isDeleteLock if this is special delete lock.
* @return The new lock id.
*/
- private static IgniteUuid composeLockId(boolean isDeleteLock) {
- return isDeleteLock ? DELETE_LOCK_ID : IgniteUuid.randomUuid();
+ private IgniteUuid composeLockId(boolean isDeleteLock) {
+ if (isDeleteLock)
+ return DELETE_LOCK_ID;
+
+ return IgniteUuid.fromUuid(locNode.id());
}
/**
[5/5] ignite git commit: Merge branches 'ignite-843-rc1' and 'master'
of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1
Posted by ak...@apache.org.
Merge branches 'ignite-843-rc1' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60d85000
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60d85000
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60d85000
Branch: refs/heads/ignite-843-rc1
Commit: 60d850009e83a9fe66c7ebe504289b00254ac722
Parents: bd7b27d 43b40f4
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Oct 21 08:53:22 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Oct 21 08:53:22 2015 +0700
----------------------------------------------------------------------
.../ignite/internal/processors/igfs/IgfsMetaManager.java | 10 +++++++---
.../processors/cache/CacheAffinityCallSelfTest.java | 4 +++-
.../IgniteCacheClientNodeChangingTopologyTest.java | 4 +++-
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[4/5] ignite git commit: Merge remote-tracking branch 'apache/master'
Posted by ak...@apache.org.
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43b40f4c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43b40f4c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43b40f4c
Branch: refs/heads/ignite-843-rc1
Commit: 43b40f4c405eac860b75c0648a0656dbb12eec92
Parents: 6ffd5ce f619e09
Author: ashutak <as...@gridgain.com>
Authored: Tue Oct 20 15:56:50 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Oct 20 15:56:50 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/igfs/IgfsMetaManager.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/5] ignite git commit: Muted test
CacheAffinityCallSelfTest.testAffinityCallNoServerNode
Posted by ak...@apache.org.
Muted test CacheAffinityCallSelfTest.testAffinityCallNoServerNode
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ffd5ce3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ffd5ce3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ffd5ce3
Branch: refs/heads/ignite-843-rc1
Commit: 6ffd5ce310b13bd63d4eee3abfb434cd7f76e0eb
Parents: 75fb19d
Author: ashutak <as...@gridgain.com>
Authored: Tue Oct 20 15:55:58 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Tue Oct 20 15:55:58 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/CacheAffinityCallSelfTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ffd5ce3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
index b9ff46c..8530fbb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
@@ -134,6 +134,8 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testAffinityCallNoServerNode() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1741");
+
startGridsMultiThreaded(SERVERS_COUNT + 1);
final Integer key = 1;
@@ -210,4 +212,4 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
return null;
}
}
-}
\ No newline at end of file
+}