openstack/nova
Code Issues Proposed changes

Merge "Capture exception for JSON load in virt.storage_users"

Browse Source
This commit is contained in:
Jenkins 2014-02-10 02:26:38 +00:00 committed by Gerrit Code Review
commit 9f24f0d40f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nova/virt/storage_users.py
View File

@ -17,9 +17,13 @@ import json
import os
import time
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
from nova import utils
from oslo.config import cfg
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
TWENTY_FOUR_HOURS = 3600 * 24
@ -53,7 +57,11 @@ def register_storage_use(storage_path, hostname):
id_path = os.path.join(storage_path, 'compute_nodes')
if os.path.exists(id_path):
with open(id_path) as f:
d = json.loads(f.read())
try:
d = json.loads(f.read())
except ValueError:
LOG.warning(_("Cannot decode JSON from %(id_path)s"),
{"id_path": id_path})
d[hostname] = time.time()
@ -87,7 +95,11 @@ def get_storage_users(storage_path):
id_path = os.path.join(storage_path, 'compute_nodes')
if os.path.exists(id_path):
with open(id_path) as f:
d = json.loads(f.read())
try:
d = json.loads(f.read())
except ValueError:
LOG.warning(_("Cannot decode JSON from %(id_path)s"),
{"id_path": id_path})
recent_users = []
for node in d: