parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Remove size field from volume objects 

This data is just in the stats anyways.
This commit is contained in:
Joshua Boniface 2019-06-19 10:45:14 -04:00
parent 09562fdc06
commit 87907d4ce8
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
node-daemon/pvcd/CephInstance.py
View File

@ -457,24 +457,8 @@ class CephVolumeInstance(object):
self.this_node = this_node self.this_node = this_node
self.pool = pool self.pool = pool
self.name = name self.name = name
self.size = ''
self.stats = dict() self.stats = dict()
@self.zk_conn.DataWatch('/ceph/volumes/{}/{}/size'.format(self.pool, self.name))
def watch_volume_node(data, stat, event=''):
if event and event.type == 'DELETED':
# The key has been deleted after existing before; terminate this watcher
# because this class instance is about to be reaped in Daemon.py
return False
try:
data = data.decode('ascii')
except AttributeError:
data = ''
if data and data != self.size:
self.size = data
@self.zk_conn.DataWatch('/ceph/volumes/{}/{}/stats'.format(self.pool, self.name)) @self.zk_conn.DataWatch('/ceph/volumes/{}/{}/stats'.format(self.pool, self.name))
def watch_volume_stats(data, stat, event=''): def watch_volume_stats(data, stat, event=''):
if event and event.type == 'DELETED': if event and event.type == 'DELETED':
@ -511,7 +495,6 @@ def add_volume(zk_conn, logger, pool, name, size):
# Add the new volume to ZK # Add the new volume to ZK
zkhandler.writedata(zk_conn, { zkhandler.writedata(zk_conn, {
'/ceph/volumes/{}/{}'.format(pool, name): '', '/ceph/volumes/{}/{}'.format(pool, name): '',
'/ceph/volumes/{}/{}/size'.format(pool, name): size,
'/ceph/volumes/{}/{}/stats'.format(pool, name): volstats, '/ceph/volumes/{}/{}/stats'.format(pool, name): volstats,
'/ceph/snapshots/{}/{}'.format(pool, name): '', '/ceph/snapshots/{}/{}'.format(pool, name): '',
}) })