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 2016/06/08 12:19:46 UTC
[05/11] ignite git commit: IGNITE-3259: Delete worker is not started
on client nodes any more.
IGNITE-3259: Delete worker is not started on client nodes any more.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33b0eb24
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33b0eb24
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33b0eb24
Branch: refs/heads/master
Commit: 33b0eb24dc7daebc13c07eb967e5b4ed7171ae55
Parents: 3cabdcf
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Jun 6 18:10:36 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Jun 8 14:49:36 2016 +0300
----------------------------------------------------------------------
.../processors/igfs/IgfsMetaManager.java | 25 ++++++++++++++------
1 file changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/33b0eb24/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 1a88a88..e1a181d 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
@@ -208,19 +208,20 @@ public class IgfsMetaManager extends IgfsManager {
locNode = igfsCtx.kernalContext().discovery().localNode();
// Start background delete worker.
- delWorker = new IgfsDeleteWorker(igfsCtx);
+ if (!client) {
+ delWorker = new IgfsDeleteWorker(igfsCtx);
- delWorker.start();
+ delWorker.start();
+ }
}
/** {@inheritDoc} */
@Override protected void onKernalStop0(boolean cancel) {
IgfsDeleteWorker delWorker0 = delWorker;
- if (delWorker0 != null)
+ if (delWorker0 != null) {
delWorker0.cancel();
- if (delWorker0 != null) {
try {
U.join(delWorker0);
}
@@ -1137,7 +1138,7 @@ public class IgfsMetaManager extends IgfsManager {
tx.commit();
- delWorker.signal();
+ signalDeleteWorker();
return newInfo.id();
}
@@ -1214,7 +1215,7 @@ public class IgfsMetaManager extends IgfsManager {
tx.commit();
- delWorker.signal();
+ signalDeleteWorker();
return victimId;
}
@@ -2524,7 +2525,7 @@ public class IgfsMetaManager extends IgfsManager {
Boolean res = synchronizeAndExecute(task, fs, false, Collections.singleton(trashId), path);
- delWorker.signal();
+ signalDeleteWorker();
return res;
}
@@ -3389,4 +3390,14 @@ public class IgfsMetaManager extends IgfsManager {
else
IgfsUtils.sendEvents(igfsCtx.kernalContext(), leafPath, EventType.EVT_IGFS_DIR_CREATED);
}
+
+ /**
+ * Signal delete worker thread.
+ */
+ private void signalDeleteWorker() {
+ IgfsDeleteWorker delWorker0 = delWorker;
+
+ if (delWorker0 != null)
+ delWorker0.signal();
+ }
}
\ No newline at end of file