Merge pull request omgnetwork#31 from deckmon/master

snapshot rotate
deckmon · Jun 23, 2018 · 50fca24 · 50fca24
2 parents 62c3aa3 + 66e4cb0
commit 50fca24
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/plasma/child_chain/snapshot.py b/plasma/child_chain/snapshot.py
@@ -11,7 +11,7 @@ def list_snapshots():
         dir_path = os.path.join(plasma_config["PICKLE_DIR"], dir_name)
         if os.path.isdir(dir_path):
             res.append(dir_name)
-    return res
+    return sorted(res)
 
 
 def get_max_snapshot():
@@ -39,4 +39,8 @@ def make_snapshot():
         file_path = os.path.join(plasma_config["PICKLE_DIR"], file_name)
         if os.path.isfile(file_path) and file_name.endswith(".pickle"):
             shutil.copy(file_path, os.path.join(snapshot_dir, file_name))
-    print("snapshot created")
+    print("snapshot created")
+    snapshots = list_snapshots()
+    if len(snapshots) > plasma_config["MAX_SNAPSHOTS"]:
+        for snapshot in snapshots[:len(snapshots) - plasma_config["MAX_SNAPSHOTS"]]:
+            shutil.rmtree(os.path.join(plasma_config["PICKLE_DIR"], snapshot), ignore_errors=True)
diff --git a/plasma/config.py b/plasma/config.py
@@ -13,14 +13,16 @@
         ROOT_CHAIN_CONTRACT_ADDRESS="0xa3b2a1804203b75b494028966c0f62e677447a39",
         NETWORK="http://localhost:8545",
         BLOCK_AUTO_SUMBITTER_INTERVAL=1,
+        MAX_SNAPSHOTS=100,
         MIN_SNAPSHOT_SECONDS=10, # set 0 will not make snapshot
     )
 else:
     plasma_config = dict(
         ROOT_CHAIN_CONTRACT_ADDRESS="0xC47e711ac6A3D16Db0826c404d8C5d8bDC01d7b1",
         NETWORK="http://localhost:8545",
         BLOCK_AUTO_SUMBITTER_INTERVAL=30,
-        MIN_SNAPSHOT_SECONDS=0, # set 0 will not make snapshot
+        MAX_SNAPSHOTS=50,
+        MIN_SNAPSHOT_SECONDS=3600, # set 0 will not make snapshot
     )
 
 plasma_config["PICKLE_DIR"] = "child_chain_pickle"

diff --git a/plasma_tools/chain_inspect.py b/plasma_tools/chain_inspect.py
@@ -19,7 +19,7 @@
 from plasma.child_chain.snapshot import list_snapshots
 
 
-list_timestamp = lambda: sorted(list_snapshots())
+list_timestamp = list_snapshots
 
 
 class ChildChainSnapshot(object):