core-edge: remove return value from applier sync

It was no longer used and always returned true.
neo4j · May 25, 2016 · ae693be · ae693be
1 parent e29f2b4
commit ae693be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreState.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreState.java
@@ -96,7 +96,7 @@ public CoreState(
         this.commitIndexMonitor = monitors.newMonitor( RaftLogCommitIndexMonitor.class, getClass() );
     }
 
-    public synchronized void setStateMachine( CoreStateMachines coreStateMachines, long lastApplied )
+    synchronized void setStateMachine( CoreStateMachines coreStateMachines, long lastApplied )
     {
         this.coreStateMachines = coreStateMachines;
         this.lastApplied = this.lastFlushed = lastApplied;
@@ -187,11 +187,7 @@ public void compact() throws IOException
      */
     public synchronized void downloadSnapshot( AdvertisedSocketAddress source ) throws InterruptedException, StoreCopyFailedException
     {
-        if ( !applier.sync( true ) )
+        applier.sync( true );
-        {
-            throw new StoreCopyFailedException( "Failed to synchronize with executor" );
-        }
-
         downloader.downloadSnapshot( source, this );
     }
 
@@ -238,10 +234,8 @@ public synchronized void start() throws IOException, RaftLogCompactedException,
     @Override
     public synchronized void stop() throws Throwable
     {
-        if ( applier.sync( true ) )
+        applier.sync( true );
-        {
+        flush();
-            flush();
-        }
     }
 
     public synchronized CoreSnapshot snapshot() throws IOException, RaftLogCompactedException
@@ -256,7 +250,7 @@ public synchronized CoreSnapshot snapshot() throws IOException, RaftLogCompacted
         return coreSnapshot;
     }
 
-    public synchronized void installSnapshot( CoreSnapshot coreSnapshot )
+    synchronized void installSnapshot( CoreSnapshot coreSnapshot )
     {
         coreStateMachines.installSnapshots( coreSnapshot );
         sessionState = coreSnapshot.get( CoreStateType.SESSION_TRACKER );

diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateApplier.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/raft/state/CoreStateApplier.java
@@ -85,12 +85,9 @@ public void submit( Function<Status,Runnable> abortableTask )
      *
      * @param cancelTasks Whether or not to flag for cancelling.
      *
-     * @return Returns true if the executor managed to synchronize with the executor, meaning
-     *         it successfully finished pending tasks. Otherwise false.
-     *
      * @throws InterruptedException
      */
-    public boolean sync( boolean cancelTasks ) throws InterruptedException
+    public void sync( boolean cancelTasks ) throws InterruptedException
     {
         if ( applier != null )
         {
@@ -108,6 +105,5 @@ public boolean sync( boolean cancelTasks ) throws InterruptedException
         }
 
         spawnExecutor();
-        return true;
     }
 }