Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ignite.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: vozerov@apache.org
To: commits@ignite.incubator.apache.org
Date: Tue, 30 Jun 2015 12:27:40 -0000
Message-Id: <92c9b1f86087451681da66cb384a0689@git.apache.org>
In-Reply-To: <8f6e59cd2a334b5880ee17bf326141bc@git.apache.org>
References: <8f6e59cd2a334b5880ee17bf326141bc@git.apache.org>
Subject: [05/49] incubator-ignite git commit: # GG-10457 Added check for
 illegal cache state + minor javadocs fixes.

# GG-10457 Added check for illegal cache state + minor javadocs fixes.


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

Branch: refs/heads/ignite-gg-10239
Commit: 12821b79d2304f3e9a435e6323c57bc71f85bd2d
Parents: 1c66078
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Jun 23 15:26:19 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Jun 23 15:26:19 2015 +0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/internal/visor/VisorJob.java | 2 ++
 .../org/apache/ignite/internal/visor/log/VisorLogSearchTask.java | 2 +-
 .../ignite/internal/visor/node/VisorNodeDataCollectorJob.java    | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12821b79/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
index 34414b5..8a017a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorJob.java
@@ -47,6 +47,7 @@ public abstract class VisorJob<A, R> extends ComputeJobAdapter {
      * Create job with specified argument.
      *
      * @param arg Job argument.
+     * @param debug Flag indicating whether debug information should be printed into node log.
      */
     protected VisorJob(@Nullable A arg, boolean debug) {
         super(arg);
@@ -77,6 +78,7 @@ public abstract class VisorJob<A, R> extends ComputeJobAdapter {
      *
      * @param arg Task argument.
      * @return Result.
+     * @throws IgniteException In case of error.
      */
     protected abstract R run(@Nullable A arg) throws IgniteException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12821b79/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
index 3ebfb2d..0fa5f06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
@@ -136,7 +136,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchTask.Vi
          * @param searchStr Search string.
          * @param limit Max number of search results.
          * @return Collection of found descriptors.
-         * @throws IOException
+         * @throws IOException In case of I/O error.
          */
         private List<GridTuple3<String[], Integer, Integer>> searchInFile(File f, Charset charset, String searchStr,
             int limit) throws IOException {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12821b79/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index c850ab0..2ecba01 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -130,6 +130,10 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
                         if (cache != null)
                             res.caches().add(cache);
                     }
+                    catch(IllegalStateException e) {
+                        if (debug && ignite.log() != null)
+                            ignite.log().error("Ignored cache: " + cacheName, e);
+                    }
                     finally {
                         if (debug)
                             log(ignite.log(), "Collected cache: " + cacheName, getClass(), start0);