fixed up log levels
This commit is contained in:
parent
a3cb8529a1
commit
359107f7dc
@ -6,23 +6,25 @@ import json
|
|||||||
|
|
||||||
from charmhelpers.core.hookenv import (
|
from charmhelpers.core.hookenv import (
|
||||||
log,
|
log,
|
||||||
|
DEBUG,
|
||||||
INFO,
|
INFO,
|
||||||
ERROR
|
ERROR,
|
||||||
)
|
)
|
||||||
from charmhelpers.contrib.storage.linux.ceph import (
|
from charmhelpers.contrib.storage.linux.ceph import (
|
||||||
create_pool,
|
create_pool,
|
||||||
pool_exists
|
pool_exists,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def decode(f):
|
def decode_req_encode_rsp(f):
|
||||||
|
"""Decorator to decode incoming requests and encode responses."""
|
||||||
def decode_inner(req):
|
def decode_inner(req):
|
||||||
return json.dumps(f(json.loads(req)))
|
return json.dumps(f(json.loads(req)))
|
||||||
|
|
||||||
return decode_inner
|
return decode_inner
|
||||||
|
|
||||||
|
|
||||||
@decode
|
@decode_req_encode_rsp
|
||||||
def process_requests(reqs):
|
def process_requests(reqs):
|
||||||
"""Process Ceph broker request(s).
|
"""Process Ceph broker request(s).
|
||||||
|
|
||||||
@ -33,6 +35,7 @@ def process_requests(reqs):
|
|||||||
version = reqs.get('api-version')
|
version = reqs.get('api-version')
|
||||||
if version == 1:
|
if version == 1:
|
||||||
return process_requests_v1(reqs['ops'])
|
return process_requests_v1(reqs['ops'])
|
||||||
|
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
log(str(exc), level=ERROR)
|
log(str(exc), level=ERROR)
|
||||||
msg = ("Unexpected error occurred while processing requests: %s" %
|
msg = ("Unexpected error occurred while processing requests: %s" %
|
||||||
@ -56,7 +59,7 @@ def process_requests_v1(reqs):
|
|||||||
log("Processing %s ceph broker requests" % (len(reqs)), level=INFO)
|
log("Processing %s ceph broker requests" % (len(reqs)), level=INFO)
|
||||||
for req in reqs:
|
for req in reqs:
|
||||||
op = req.get('op')
|
op = req.get('op')
|
||||||
log("Processing op='%s'" % (op), level=INFO)
|
log("Processing op='%s'" % (op), level=DEBUG)
|
||||||
# Use admin client since we do not have other client key locations
|
# Use admin client since we do not have other client key locations
|
||||||
# setup to use them for these operations.
|
# setup to use them for these operations.
|
||||||
svc = 'admin'
|
svc = 'admin'
|
||||||
@ -78,7 +81,7 @@ def process_requests_v1(reqs):
|
|||||||
create_pool(service=svc, name=pool, replicas=replicas)
|
create_pool(service=svc, name=pool, replicas=replicas)
|
||||||
else:
|
else:
|
||||||
log("Pool '%s' already exists - skipping create" % (pool),
|
log("Pool '%s' already exists - skipping create" % (pool),
|
||||||
level=INFO)
|
level=DEBUG)
|
||||||
else:
|
else:
|
||||||
msg = "Unknown operation '%s'" % (op)
|
msg = "Unknown operation '%s'" % (op)
|
||||||
log(msg, level=ERROR)
|
log(msg, level=ERROR)
|
||||||
|
@ -16,7 +16,7 @@ import sys
|
|||||||
import ceph
|
import ceph
|
||||||
from charmhelpers.core.hookenv import (
|
from charmhelpers.core.hookenv import (
|
||||||
log,
|
log,
|
||||||
INFO,
|
DEBUG,
|
||||||
ERROR,
|
ERROR,
|
||||||
config,
|
config,
|
||||||
relation_ids,
|
relation_ids,
|
||||||
@ -300,15 +300,13 @@ def client_relation_changed(relid=None):
|
|||||||
settings = relation_get(rid=relid)
|
settings = relation_get(rid=relid)
|
||||||
if 'broker_req' in settings:
|
if 'broker_req' in settings:
|
||||||
if not ceph.is_leader():
|
if not ceph.is_leader():
|
||||||
log("Not leader - ignoring broker request", level=INFO)
|
log("Not leader - ignoring broker request", level=DEBUG)
|
||||||
else:
|
else:
|
||||||
req = settings['broker_req']
|
rsp = process_requests(settings['broker_req'])
|
||||||
log("Broker request received from ceph client")
|
|
||||||
rsp = process_requests(req)
|
|
||||||
relation_set(relation_id=relid,
|
relation_set(relation_id=relid,
|
||||||
relation_settings={'broker_rsp': rsp})
|
relation_settings={'broker_rsp': rsp})
|
||||||
else:
|
else:
|
||||||
log('mon cluster not in quorum')
|
log('mon cluster not in quorum', level=DEBUG)
|
||||||
|
|
||||||
|
|
||||||
@hooks.hook('upgrade-charm')
|
@hooks.hook('upgrade-charm')
|
||||||
|
Loading…
Reference in New Issue
Block a user