You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/18 11:06:57 UTC
ignite git commit: .NET revert debug
Repository: ignite
Updated Branches:
refs/heads/ignite-4986 365f1fc49 -> 1a9e5aec4
.NET revert debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1a9e5aec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1a9e5aec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1a9e5aec
Branch: refs/heads/ignite-4986
Commit: 1a9e5aec43b170394a615a49921932c2a8691d86
Parents: 365f1fc
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Apr 18 14:07:33 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Apr 18 14:07:33 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheProcessor.java | 13 +------------
.../org/apache/ignite/internal/util/IgniteUtils.java | 5 -----
2 files changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a9e5aec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index debabb5..7841f06 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -965,8 +965,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public void stop(boolean cancel) throws IgniteCheckedException {
- U.debug("Stopping cache processor");
-
stopCaches(cancel);
List<? extends GridCacheSharedManager<?, ?>> mgrs = sharedCtx.managers();
@@ -994,16 +992,11 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (cache != null)
stopCache(cache, cancel, false);
- else
- U.debug("CACHE IS NULL: " + cacheName);
}
for (GridCacheAdapter<?, ?> cache : stoppedCaches.values()) {
if (cache == stoppedCaches.remove(maskNull(cache.name())))
stopCache(cache, cancel, false);
- else {
- U.debug("????? " + cache.name());
- }
}
registeredCaches.clear();
@@ -1294,11 +1287,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
ctx.kernalContext().cache().context().database().onCacheStop(ctx);
- Iterable<Object> lca = lifecycleAwares(cache.configuration(), ctx.store().configuredStore());
-
- U.debug("LCA for cache [cache=" + cache.configuration().getName() + ", LCA=" + lca + ']');
-
- U.stopLifecycleAware(log, lca);
+ U.stopLifecycleAware(log, lifecycleAwares(cache.configuration(), ctx.store().configuredStore()));
if (log.isInfoEnabled())
log.info("Stopped cache: " + cache.name());
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a9e5aec/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 49b0381..7d7d071 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -8718,17 +8718,12 @@ public abstract class IgniteUtils {
for (Object obj : objs) {
if (obj instanceof LifecycleAware) {
try {
- U.debug("Going to stop lifecycle aware: " + obj);
-
((LifecycleAware)obj).stop();
}
catch (Exception e) {
U.error(log, "Failed to stop component (ignoring): " + obj, e);
}
}
- else {
- U.debug("Object is NOT lifecycle aware: " + obj);
- }
}
}