[ignite-3] branch main updated: IGNITE-19989 Fixed the name of updater thread and made it finish on node stop (#2332)

[vpyatkov]

This is an automated email from the ASF dual-hosted git repository.

vpyatkov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new cb67401ecd IGNITE-19989 Fixed the name of updater thread and made it 
finish on node stop (#2332)
cb67401ecd is described below

commit cb67401ecdd071eaca17c3e4b1a7b48fcd7b368b
Author: Denis Chudov <moongll...@gmail.com>
AuthorDate: Fri Jul 21 11:14:19 2023 +0300

    IGNITE-19989 Fixed the name of updater thread and made it finish on node 
stop (#2332)
---
 .../ignite/internal/placementdriver/LeaseUpdater.java     | 15 ++++++++++++---
 .../internal/placementdriver/PlacementDriverManager.java  | 10 +++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git 
a/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/LeaseUpdater.java
 
b/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/LeaseUpdater.java
index 7e63d9e45f..49e386a5a2 100644
--- 
a/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/LeaseUpdater.java
+++ 
b/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/LeaseUpdater.java
@@ -180,7 +180,7 @@ public class LeaseUpdater {
         leaseNegotiator = new LeaseNegotiator(clusterService);
 
         //TODO: IGNITE-18879 Implement lease maintenance.
-        updaterTread = new Thread(updater, 
NamedThreadFactory.threadPrefix(nodeName, "lease-updater"));
+        updaterTread = new Thread(updater, 
NamedThreadFactory.threadPrefix(nodeName, "lease-updater") + '0');
 
         updaterTread.start();
     }
@@ -195,14 +195,14 @@ public class LeaseUpdater {
 
         stateActorLock.block();
 
+        leaseNegotiator = null;
+
         //TODO: IGNITE-18879 Implement lease maintenance.
         if (updaterTread != null) {
             updaterTread.interrupt();
 
             updaterTread = null;
         }
-
-        leaseNegotiator = null;
     }
 
     /**
@@ -270,6 +270,15 @@ public class LeaseUpdater {
         return null;
     }
 
+    /**
+     * Whether is active.
+     *
+     * @return Whether is active.
+     */
+    public boolean active() {
+        return active.get();
+    }
+
     /**
      * Runnable to update lease in Meta storage.
      */
diff --git 
a/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/PlacementDriverManager.java
 
b/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/PlacementDriverManager.java
index 300f7e4253..277b0dab82 100644
--- 
a/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/PlacementDriverManager.java
+++ 
b/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/PlacementDriverManager.java
@@ -89,8 +89,6 @@ public class PlacementDriverManager implements 
IgniteComponent {
     /** Lease updater. */
     private final LeaseUpdater leaseUpdater;
 
-    private volatile boolean isActiveActor;
-
     /**
      * The constructor.
      *
@@ -202,6 +200,8 @@ public class PlacementDriverManager implements 
IgniteComponent {
         busyLock.block();
 
         withRaftClientIfPresent(TopologyAwareRaftGroupService::shutdown);
+
+        leaseUpdater.deactivate();
     }
 
     private void 
withRaftClientIfPresent(Consumer<TopologyAwareRaftGroupService> closure) {
@@ -236,8 +236,6 @@ public class PlacementDriverManager implements 
IgniteComponent {
     private void takeOverActiveActor() {
         LOG.info("Placement driver active actor is starting.");
 
-        isActiveActor = true;
-
         leaseUpdater.activate();
     }
 
@@ -248,13 +246,11 @@ public class PlacementDriverManager implements 
IgniteComponent {
     private void stepDownActiveActor() {
         LOG.info("Placement driver active actor is stopping.");
 
-        isActiveActor = false;
-
         leaseUpdater.deactivate();
     }
 
     @TestOnly
     boolean isActiveActor() {
-        return isActiveActor;
+        return leaseUpdater.active();
     }
 }