X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.acorn%2Fsrc%2Forg%2Fsimantics%2Facorn%2FClusterManager.java;h=9725ffe8da2df0aabb169b301b955642781205dd;hb=7cc6ec281e1c226d2ec47b5bc52b83be3972cc1c;hp=40c5de37e8c1991e6e5ce846e2b90e7b651b6c5e;hpb=32db32b8c6f1f0feba6905c3c68579f6b5891821;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
index 40c5de37e..9725ffe8d 100644
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
@@ -2,7 +2,6 @@ package org.simantics.acorn;
 
 import java.io.IOException;
 import java.math.BigInteger;
-import java.nio.file.CopyOption;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -24,7 +23,6 @@ import org.simantics.acorn.lru.ClusterLRU;
 import org.simantics.acorn.lru.ClusterStreamChunk;
 import org.simantics.acorn.lru.FileInfo;
 import org.simantics.acorn.lru.LRU;
-import org.simantics.databoard.file.RuntimeIOException;
 import org.simantics.db.ClusterCreator;
 import org.simantics.db.Database.Session.ClusterIds;
 import org.simantics.db.Database.Session.ResourceSegment;
@@ -265,11 +263,11 @@ public class ClusterManager {
     		// Nothing has been written => no need to do anything
     		long amountOfFiles = countFiles(workingDirectory);
     		if(!fullSave && amountOfFiles == 0) {
-    //		    System.err.println("amountOfFiles < 3");
+        		//LOGGER.info("makeSnapshot: " + amountOfFiles + " files, skipping snapshot");
     		    return false;
     		}
     
-    		LOGGER.info("makeSnapshot");
+    		LOGGER.info("makeSnapshot: start with " + amountOfFiles + " files");
     
     		// Schedule writing of all data to disk
             refreshHeadState();
@@ -289,13 +287,11 @@ public class ClusterManager {
 
     		persistHeadState();
 
-    		if (fullSave)
-    		    mainState.save(dbFolder);
-    
-    		amountOfFiles = countFiles(workingDirectory);
-    		
-    		LOGGER.info(" -finished: amount of files is {}", amountOfFiles);
-    
+    		if (LOGGER.isInfoEnabled()) {
+    			amountOfFiles = countFiles(workingDirectory);
+    			LOGGER.info(" -finished: amount of files is {}", amountOfFiles);
+    		}
+
     		workingDirectory = dbFolder.resolve(Integer.toString(mainState.headDir));
     		if (!Files.exists(workingDirectory)) {
     		    Files.createDirectories(workingDirectory);
@@ -405,40 +401,44 @@ public class ClusterManager {
 	public void load() throws IOException {
 
 		// Main state
-		mainState = MainState.load(dbFolder, t -> rollback.set(true));
+		mainState = MainState.load(dbFolder, () -> rollback.set(true));
 
 		lastSessionDirectory = dbFolder.resolve(Integer.toString(mainState.headDir - 1));
 		
 		// Head State
-		try {
-            state = HeadState.load(lastSessionDirectory);
-        } catch (InvalidHeadStateException e) {
-            // For backwards compatibility only!
-            Throwable cause = e.getCause();
-            if (cause instanceof Throwable) {
-                try {
-                    org.simantics.db.javacore.HeadState oldState = org.simantics.db.javacore.HeadState.load(lastSessionDirectory);
-                    
-                    HeadState newState = new HeadState();
-                    newState.clusters = oldState.clusters;
-                    newState.cs = oldState.cs;
-                    newState.files = oldState.files;
-                    newState.stream = oldState.stream;
-                    newState.headChangeSetId = oldState.headChangeSetId;
-                    newState.reservedIds = oldState.reservedIds;
-                    newState.transactionId = oldState.transactionId;
-                    state = newState;
-                } catch (InvalidHeadStateException e1) {
-                    throw new IOException("Could not load HeadState due to corruption", e1);
-                }
-            } else {
-                // This should never happen as MainState.load() checks the integrity
-                // of head.state files and rolls back in cases of corruption until a
-                // consistent state is found (could be case 0 - initial db state)
-                // IF this does happen something is completely wrong
-                throw new IOException("Could not load HeadState due to corruption", e);
-            }
-        }
+		if (mainState.isInitial()) {
+			state = new HeadState();
+		} else {
+			try {
+	            state = HeadState.load(lastSessionDirectory);
+	        } catch (InvalidHeadStateException e) {
+	            // For backwards compatibility only!
+	            Throwable cause = e.getCause();
+	            if (cause instanceof Throwable) {
+	                try {
+	                    org.simantics.db.javacore.HeadState oldState = org.simantics.db.javacore.HeadState.load(lastSessionDirectory);
+	                    
+	                    HeadState newState = new HeadState();
+	                    newState.clusters = oldState.clusters;
+	                    newState.cs = oldState.cs;
+	                    newState.files = oldState.files;
+	                    newState.stream = oldState.stream;
+	                    newState.headChangeSetId = oldState.headChangeSetId;
+	                    newState.reservedIds = oldState.reservedIds;
+	                    newState.transactionId = oldState.transactionId;
+	                    state = newState;
+	                } catch (InvalidHeadStateException e1) {
+	                    throw new IOException("Could not load HeadState due to corruption", e1);
+	                }
+	            } else {
+	                // This should never happen as MainState.load() checks the integrity
+	                // of head.state files and rolls back in cases of corruption until a
+	                // consistent state is found (could be case 0 - initial db state)
+	                // IF this does happen something is completely wrong
+	                throw new IOException("Could not load HeadState due to corruption", e);
+	            }
+	        }
+		}
 		try {
     		workingDirectory = dbFolder.resolve(Integer.toString(mainState.headDir));
     		Files.createDirectories(workingDirectory);