ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject incubator-ignite git commit: # IGNITE-980: Review.
Date Tue, 23 Jun 2015 09:09:06 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-980 72f09295d -> 0544ef014


# IGNITE-980: 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/0544ef01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0544ef01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0544ef01

Branch: refs/heads/ignite-980
Commit: 0544ef014bd7b2dbf7533ea99c926c6382a6b1dd
Parents: 72f0929
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Jun 23 12:09:18 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Jun 23 12:09:18 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/hadoop/HadoopJobInfo.java      | 2 ++
 .../processors/hadoop/fs/HadoopFileSystemCacheUtil.java       | 1 +
 .../processors/hadoop/jobtracker/HadoopJobTracker.java        | 6 ++++--
 .../ignite/internal/processors/hadoop/v2/HadoopV2Job.java     | 7 +++++--
 .../processors/hadoop/v2/HadoopV2JobResourceManager.java      | 3 ++-
 5 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0544ef01/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
index b56d3d1..1be5a06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobInfo.java
@@ -60,6 +60,8 @@ public interface HadoopJobInfo extends Serializable {
      * @return Job.
      * @throws IgniteCheckedException If failed.
      */
+    // TODO: Docs
+    // TODO: jobCls0 => jobCls
     public HadoopJob createJob(Class<? extends HadoopJob> jobCls0,
         HadoopJobId jobId, IgniteLogger log) throws IgniteCheckedException;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0544ef01/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopFileSystemCacheUtil.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopFileSystemCacheUtil.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopFileSystemCacheUtil.java
index 397b13e..4abb3c2 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopFileSystemCacheUtil.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/fs/HadoopFileSystemCacheUtil.java
@@ -32,6 +32,7 @@ import java.net.*;
 /**
  * File system cache utility methods used by Map-Reduce tasks and jobs.
  */
+// TODO: Util -> Utils
 public class HadoopFileSystemCacheUtil {
     /**
      * A common static factory method. Creates new HadoopLazyConcurrentMap.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0544ef01/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
index ae8e107..e809fde 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
@@ -84,7 +84,7 @@ public class HadoopJobTracker extends HadoopComponent {
     private GridSpinReadWriteLock busyLock;
 
     /** Class to create HadoopJob instances from. */
-    private volatile Class<? extends HadoopJob> jobCls;
+    private Class<? extends HadoopJob> jobCls;
 
     /** Closure to check result of async transform of system cache. */
     private final IgniteInClosure<IgniteInternalFuture<?>> failsLog = new CI1<IgniteInternalFuture<?>>()
{
@@ -115,7 +115,9 @@ public class HadoopJobTracker extends HadoopComponent {
 
         try {
             jobCls = (Class<HadoopV2Job>)ldr.loadClass(HadoopV2Job.class.getName());
-        } catch (Exception ioe) {
+        }
+        catch (Exception ioe) {
+            // TODO: IgniteCheckedException, message
             throw new IgniteException(ioe);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0544ef01/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
index 0defd93..ac0ba78 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2Job.java
@@ -84,10 +84,10 @@ public class HadoopV2Job implements HadoopJob {
     private volatile byte[] jobConfData;
 
     /** File system cache map. */
-    private final HadoopLazyConcurrentMap<FsCacheKey, FileSystem> fsMap
-        = createHadoopLazyConcurrentMap();
+    private final HadoopLazyConcurrentMap<FsCacheKey, FileSystem> fsMap = createHadoopLazyConcurrentMap();
 
     /** Disposal guard. */
+    // TODO: Remove.
     private final AtomicBoolean disposed = new AtomicBoolean();
 
     /**
@@ -276,6 +276,7 @@ public class HadoopV2Job implements HadoopJob {
     /** {@inheritDoc} */
     @SuppressWarnings("ThrowFromFinallyBlock")
     @Override public void dispose(boolean external) throws IgniteCheckedException {
+        // TODO: Remove.
         boolean dsp = disposed.compareAndSet(false, true);
 
         if (!dsp)
@@ -310,6 +311,7 @@ public class HadoopV2Job implements HadoopJob {
 
                     // Also close all the FileSystems cached in
                     // HadoopLazyConcurrentMap for this *task* class loader:
+                    // TODO: Ensure it is called even in case of Exception from stopHadoopFsDaemons.
                     closeCachedTaskFileSystems(ldr);
                 }
                 catch (Throwable e) {
@@ -324,6 +326,7 @@ public class HadoopV2Job implements HadoopJob {
             assert fullCtxClsQueue.isEmpty();
 
             // Close all cached file systems for this *Job*:
+            // TODO: Wrap into try-catch.
             fsMap.close();
 
             if (err != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0544ef01/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java
index 97ad179..912cc3f 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2JobResourceManager.java
@@ -41,7 +41,8 @@ import java.util.*;
  */
 class HadoopV2JobResourceManager {
     /** File type Fs disable caching property name. */
-    private static final String FILE_DISABLE_CACHING_PROPERTY_NAME = HadoopFileSystemsUtils.disableFsCachePropertyName("file");
+    private static final String FILE_DISABLE_CACHING_PROPERTY_NAME =
+        HadoopFileSystemsUtils.disableFsCachePropertyName("file");
 
     /** Hadoop job context. */
     private final JobContextImpl ctx;


Mime
View raw message