From db0b382b3d0506cd2ad132374c13677fd931d704 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Wed, 19 Jun 2019 09:43:04 -0400 Subject: [PATCH] Don't bother with snapshot management by Daemon This is *definitely* not needed in the end, and just uses RAM for no conceivable purpose. Snapshots are fully client-managed. --- node-daemon/pvcd/Daemon.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/node-daemon/pvcd/Daemon.py b/node-daemon/pvcd/Daemon.py index 3b6b2175..af1bde2b 100644 --- a/node-daemon/pvcd/Daemon.py +++ b/node-daemon/pvcd/Daemon.py @@ -861,27 +861,6 @@ if enable_storage: volume_list = new_volume_list logger.out('{}Volume list:{} {}'.format(logger.fmt_blue, logger.fmt_end, ' '.join(volume_list)), state='i') - # Snapshot objects - for volume in volume_list: - @zk_conn.ChildrenWatch('/ceph/snapshots/{}/{}'.format(pool, volume)) - def update_snapshots(new_snapshot_list): - global snapshot_list, d_snapshot - - # Add any missing Snapshots to the list - for snapshot in new_snapshot_list: - if not snapshot in snapshot_list: - d_snapshot[snapshot] = CephInstance.CephSnapshotInstance(zk_conn, this_node, pool, volume, snapshot) - - # Remove any deleted Snapshots from the list - for snapshot in snapshot_list: - if not snapshot in new_snapshot_list: - # Delete the object - del(d_snapshot[snapshot]) - - # Update and print new list - snapshot_list = new_snapshot_list - logger.out('{}Snapshot list:{} {}'.format(logger.fmt_blue, logger.fmt_end, ' '.join(snapshot_list)), state='i') - ############################################################################### # PHASE 9 - Run the daemon ###############################################################################