You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/05/29 11:20:54 UTC
[1/4] incubator-ignite git commit: Added javadoc group.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-218-hdfs-only 8451e16fa -> 913871d92
Added javadoc group.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2859671f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2859671f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2859671f
Branch: refs/heads/ignite-218-hdfs-only
Commit: 2859671f1ff9866b9fab4de7695fbea86f458f32
Parents: 56bda96
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Fri May 29 10:02:18 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Fri May 29 10:02:18 2015 +0300
----------------------------------------------------------------------
parent/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2859671f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 44cb523..a514e35 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -317,6 +317,10 @@
<title>Spring Caching</title>
<packages>org.apache.ignite.cache.spring</packages>
</group>
+ <group>
+ <title>Mesos Framework</title>
+ <packages>org.apache.ignite.mesos*</packages>
+ </group>
</groups>
<header>
<![CDATA[
[3/4] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-218-hdfs-only' into ignite-218-hdfs-only
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-218-hdfs-only' into ignite-218-hdfs-only
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba51ff6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba51ff6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba51ff6c
Branch: refs/heads/ignite-218-hdfs-only
Commit: ba51ff6cdb5e37d0e58d86c97dad8058d9f68226
Parents: 5e42826 8451e16
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri May 29 11:38:22 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri May 29 11:38:22 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/igfs/IgfsUserContext.java | 21 ++---
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 28 +-----
.../hadoop/fs/HadoopLazyConcurrentMap.java | 97 ++++++++++++++------
.../hadoop/v2/HadoopV2TaskContext.java | 5 +-
4 files changed, 75 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-ignite git commit: Merge branch 'ignite-sprint-5'
into ignite-218-hdfs-only
Posted by vo...@apache.org.
Merge branch 'ignite-sprint-5' into ignite-218-hdfs-only
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5e428262
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e428262
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e428262
Branch: refs/heads/ignite-218-hdfs-only
Commit: 5e428262ff1379f60cdad4b275e91eed66f03cf8
Parents: 2a472e1 2859671
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri May 29 11:38:01 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri May 29 11:38:01 2015 +0300
----------------------------------------------------------------------
dev-tools/src/main/groovy/jiraslurp.groovy | 3 +
.../shmem/IpcSharedMemoryServerEndpoint.java | 2 +-
modules/mesos/README.txt | 28 +
modules/mesos/licenses/apache-2.0.txt | 202 ++++++++
modules/mesos/licenses/jetty-epl-license.txt | 69 +++
modules/mesos/pom.xml | 95 ++++
.../apache/ignite/mesos/ClusterProperties.java | 519 +++++++++++++++++++
.../apache/ignite/mesos/IgniteFramework.java | 119 +++++
.../apache/ignite/mesos/IgniteScheduler.java | 361 +++++++++++++
.../org/apache/ignite/mesos/IgniteTask.java | 86 +++
.../org/apache/ignite/mesos/package-info.java | 22 +
.../ignite/mesos/resource/IgniteProvider.java | 234 +++++++++
.../ignite/mesos/resource/JettyServer.java | 61 +++
.../ignite/mesos/resource/ResourceHandler.java | 142 +++++
.../ignite/mesos/resource/ResourceProvider.java | 120 +++++
.../ignite/mesos/resource/package-info.java | 22 +
.../main/resources/ignite-default-config.xml | 35 ++
.../org/apache/ignite/IgniteMesosTestSuite.java | 38 ++
.../ignite/mesos/IgniteSchedulerSelfTest.java | 464 +++++++++++++++++
parent/pom.xml | 4 +
pom.xml | 1 +
scripts/git-patch-prop.sh | 2 +-
22 files changed, 2627 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[4/4] incubator-ignite git commit: # Review.
Posted by vo...@apache.org.
# Review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/913871d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/913871d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/913871d9
Branch: refs/heads/ignite-218-hdfs-only
Commit: 913871d924ad69336632458e88fd63d76c4425a9
Parents: ba51ff6
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri May 29 12:21:09 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri May 29 12:21:09 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/igfs/IgfsUserContext.java | 6 +-
.../igfs/secondary/IgfsSecondaryFileSystem.java | 2 +
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 3 +
.../hadoop/fs/HadoopLazyConcurrentMap.java | 80 ++++++++------------
4 files changed, 41 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/913871d9/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
index 1242982..5a65bdb 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
@@ -108,9 +108,9 @@ public abstract class IgfsUserContext {
/**
* Gets the current context user.
- * If this method is invoked outside of any {@link #doAs(String, IgniteOutClosure)} on the call stack, it will return null.
- * Otherwise it will return the user name set in the most lower {@link #doAs(String, IgniteOutClosure)} call
- * on the call stack.
+ * If this method is invoked outside of any {@link #doAs(String, IgniteOutClosure)} on the call stack, it will
+ * return null. Otherwise it will return the user name set in the most lower
+ * {@link #doAs(String, IgniteOutClosure)} call on the call stack.
* @return The current user, may be null.
*/
@Nullable public static String currentUser() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/913871d9/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
index 9026eac..b6f8226 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
@@ -198,4 +198,6 @@ public interface IgfsSecondaryFileSystem {
* @return Map of properties.
*/
public Map<String,String> properties();
+
+ // TODO: Add close();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/913871d9/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
index 51878da..81fce96 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
@@ -42,6 +42,7 @@ import static org.apache.ignite.internal.processors.igfs.IgfsEx.*;
* In fact, this class deals with different FileSystems depending on the user context,
* see {@link IgfsUserContext#currentUser()}.
*/
+// TODO: Remove auto-closeable.
public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSystem, AutoCloseable {
/** Properties of file system, see {@link #properties()}
*
@@ -466,6 +467,8 @@ public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSys
/** {@inheritDoc} */
@Override public void close() throws IgniteCheckedException {
+ // TODO: Close default FS.
+
fileSysLazyMap.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/913871d9/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
index 0fe9871..71b38c4 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopLazyConcurrentMap.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.hadoop.fs;
import org.apache.ignite.*;
import org.apache.ignite.internal.util.future.*;
-import org.jetbrains.annotations.*;
import org.jsr166.*;
import java.io.*;
@@ -65,26 +64,25 @@ public class HadoopLazyConcurrentMap<K, V extends Closeable> {
ValueWrapper w = map.get(k);
if (w == null) {
- final ValueWrapper wNew = new ValueWrapper(k);
+ closeLock.readLock().lock();
- w = map.putIfAbsent(k, wNew);
+ try {
+ if (closed)
+ throw new IllegalStateException("Failed to create value for key [" + k
+ + "]: the map is already closed.");
- if (w == null) {
- // new wrapper 'w' has been put, so init the value:
- closeLock.readLock().lock();
+ final ValueWrapper wNew = new ValueWrapper(k);
- try {
- if (closed)
- throw new IllegalStateException("Failed to create value for key [" + k
- + "]: the map is already closed.");
+ w = map.putIfAbsent(k, wNew);
+ if (w == null) {
wNew.init();
- }
- finally {
- closeLock.readLock().unlock();
- }
- w = wNew;
+ w = wNew;
+ }
+ }
+ finally {
+ closeLock.readLock().unlock();
}
}
@@ -101,57 +99,45 @@ public class HadoopLazyConcurrentMap<K, V extends Closeable> {
}
/**
- * Gets the value without any attempt to create a new one.
- * @param k the key
- * @return the value, or null if there is no value for this key.
- */
- public @Nullable V get(K k) {
- ValueWrapper w = map.get(k);
-
- if (w == null)
- return null;
-
- try {
- return w.getValue();
- }
- catch (IgniteCheckedException ie) {
- throw new IgniteException(ie);
- }
- }
-
- /**
* Clears the map and closes all the values.
*/
public void close() throws IgniteCheckedException {
closeLock.writeLock().lock();
try {
- List<IOException> ioExs = new LinkedList<>();
+ closed = true;
+
+ Exception err = null;
Set<K> keySet = map.keySet();
- for (K key: keySet) {
- ValueWrapper w = map.get(key);
+ for (K key : keySet) {
+ V v = null;
- if (w != null) {
- try {
- V v = w.getValue();
+ try {
+ v = map.get(key).getValue();
+ }
+ catch (IgniteCheckedException ignore) {
+ // No-op.
+ }
+ if (v != null) {
+ try {
v.close();
}
- catch (IOException ioe) {
- ioExs.add(ioe);
+ catch (Exception err0) {
+ if (err == null)
+ err = err0;
}
}
}
map.clear();
- if (!ioExs.isEmpty())
- throw new IgniteCheckedException(ioExs.get(0));
-
- closed = true;
- } finally {
+ if (err != null)
+ throw new IgniteCheckedException(err);
+ }
+ finally {
closeLock.writeLock().unlock();
}
}