add debug log for npe

qq776355102 · Oct 31, 2018 · a75ab1c · a75ab1c
1 parent 3f5ad62
commit a75ab1c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/main/java/org/tron/core/db2/core/SnapshotManager.java b/src/main/java/org/tron/core/db2/core/SnapshotManager.java
@@ -70,11 +70,11 @@ public synchronized ISession buildSession(boolean forceEnable) {
       disabled = false;
     }
 
-    if (size > maxSize.get()) {
-      logger.info("****size:" + size + ", maxsize:" + maxSize.get());
-      size = maxSize.get();
-      flush();
-    }
+//    if (size > maxSize.get()) {
+//      logger.info("****size:" + size + ", maxsize:" + maxSize.get());
+//      size = maxSize.get();
+//      flush();
+//    }
     // debug begin
 //    debug();
     // debug end
@@ -205,6 +205,7 @@ public void updateSolidity(long oldSolidifiedBlockNum, long newSolidifedBlockNum
         db.getHead().updateSolidity();
       }
     }
+    flush();
   }
 
   private boolean shouldBeRefreshed() {
@@ -251,6 +252,7 @@ private void refresh() {
         // debug end
         snapshots.add(next);
         next = next.getNext();
+        --size;
       }
 
       // debug begin

diff --git a/src/main/java/org/tron/core/db2/core/SnapshotRoot.java b/src/main/java/org/tron/core/db2/core/SnapshotRoot.java
@@ -13,6 +13,7 @@
 
 public class SnapshotRoot extends AbstractSnapshot<byte[], byte[]> {
 
+  @Getter
   private Snapshot solidity;
 
   public SnapshotRoot(String parentName, String name) {
@@ -84,17 +85,12 @@ public void reset() {
   }
 
   @Override
-  public synchronized Snapshot getSolidity() {
-    return solidity;
-  }
-
-  @Override
-  public synchronized void resetSolidity() {
+  public void resetSolidity() {
     solidity = this;
   }
 
   @Override
-  public synchronized void updateSolidity() {
+  public void updateSolidity() {
     solidity = solidity.getNext();
   }
 }