Distributed: fixed problem on overwriting a old configuration

lvca · lvca · commit 98c473718c4e · 2014-02-06T02:35:40.000+01:00
diff --git a/server/src/main/java/com/orientechnologies/orient/server/distributed/ODistributedAbstractPlugin.java b/server/src/main/java/com/orientechnologies/orient/server/distributed/ODistributedAbstractPlugin.java
@@ -15,6 +15,13 @@
  */
 package com.orientechnologies.orient.server.distributed;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
 import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.common.parser.OSystemVariableResolver;
 import com.orientechnologies.orient.core.Orient;
@@ -30,13 +37,6 @@
 import com.orientechnologies.orient.server.distributed.conflict.OReplicationConflictResolver;
 import com.orientechnologies.orient.server.plugin.OServerPluginAbstract;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Abstract plugin to manage the distributed environment.
  * 
@@ -196,6 +196,7 @@ protected ODocument loadDatabaseConfiguration(final String iDatabaseName, final
       f.read(buffer);
 
       final ODocument doc = (ODocument) new ODocument().fromJSON(new String(buffer), "noMap");
+      doc.field("version", 0);
       updateCachedDatabaseConfiguration(iDatabaseName, doc, false);
       return doc;
 
@@ -212,13 +213,14 @@ protected ODocument loadDatabaseConfiguration(final String iDatabaseName, final
 
   public boolean updateCachedDatabaseConfiguration(final String iDatabaseName, final ODocument cfg, final boolean iSaveToDisk) {
     synchronized (cachedDatabaseConfiguration) {
-      // final ODocument oldCfg = cachedDatabaseConfiguration.get(iDatabaseName);
-      // if (oldCfg != null && oldCfg.field("version").equals(cfg.field("version"))) {
-      // // NO CHANGE, SKIP IT
-      // OLogManager.instance().debug(this, "Skip saving of distributed configuration file for database '%s' because is unchanged",
-      // iDatabaseName);
-      // return false;
-      // }
+      final ODocument oldCfg = cachedDatabaseConfiguration.get(iDatabaseName);
+      if (oldCfg != null && (Integer) oldCfg.field("version") > (Integer) cfg.field("version")) {
+        // NO CHANGE, SKIP IT
+        OLogManager.instance().debug(this,
+            "Skip saving of distributed configuration file for database '%s' because is unchanged (version %d)", iDatabaseName,
+            (Integer) cfg.field("version"));
+        return false;
+      }
 
       // SAVE IN NODE'S LOCAL RAM
       cachedDatabaseConfiguration.put(iDatabaseName, cfg);
@@ -268,7 +270,6 @@ public ODistributedConfiguration getDatabaseConfiguration(final String iDatabase
           cfg = loadDatabaseConfiguration(iDatabaseName, defaultDatabaseConfigFile);
           if (cfg == null)
             throw new OConfigurationException("Cannot load default distributed database config file: " + defaultDatabaseConfigFile);
-          cfg.field("version", 0);
         }
       }
       return new ODistributedConfiguration(cfg);
