Skip to content

Commit 747d64e

Browse files
author
Sergey Khoroshavin
committed
Downgraded severity of some messages from debug to trace
Signed-off-by: Sergey Khoroshavin <[email protected]>
1 parent 6907376 commit 747d64e

File tree

9 files changed

+29
-29
lines changed

9 files changed

+29
-29
lines changed

plenum/common/batched.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def flushOutBoxes(self) -> None:
9797
continue
9898
if msgs:
9999
if self._should_batch(msgs):
100-
logger.debug(
100+
logger.trace(
101101
"{} batching {} msgs to {} into fewer transmissions".
102102
format(self, len(msgs), dest))
103103
logger.trace(" messages: {}".format(msgs))

plenum/server/has_action_queue.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def wrapper():
116116
self.repeatingActions.add(action)
117117
self._schedule(wrapper, seconds)
118118
else:
119-
logger.debug('{} is already repeating'.format(
119+
logger.trace('{} is already repeating'.format(
120120
get_func_name(action)))
121121

122122
def stopRepeating(self, action: Callable, strict=True):

plenum/server/node.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ def handleOneNodeMsg(self, wrappedMsg):
15011501
try:
15021502
vmsg = self.validateNodeMsg(wrappedMsg)
15031503
if vmsg:
1504-
logger.debug("{} msg validated {}".format(self, wrappedMsg),
1504+
logger.trace("{} msg validated {}".format(self, wrappedMsg),
15051505
extra={"tags": ["node-msg-validation"]})
15061506
self.unpackNodeMsg(*vmsg)
15071507
else:
@@ -1538,7 +1538,7 @@ def validateNodeMsg(self, wrappedMsg):
15381538
self.verifySignature(message)
15391539
except BaseExc as ex:
15401540
raise SuspiciousNode(frm, ex, message) from ex
1541-
logger.debug("{} received node message from {}: {}".
1541+
logger.trace("{} received node message from {}: {}".
15421542
format(self, frm, message),
15431543
extra={"cli": False})
15441544
return message, frm
@@ -1555,7 +1555,7 @@ def unpackNodeMsg(self, msg, frm) -> None:
15551555
# a transport, it should be encapsulated.
15561556

15571557
if isinstance(msg, Batch):
1558-
logger.debug("{} processing a batch {}".format(self, msg))
1558+
logger.trace("{} processing a batch {}".format(self, msg))
15591559
for m in msg.messages:
15601560
m = self.nodestack.deserializeMsg(m)
15611561
self.handleOneNodeMsg((m, frm))
@@ -1764,7 +1764,7 @@ def preLedgerCatchUp(self, ledger_id):
17641764

17651765
# revert uncommitted txns and state for unordered requests
17661766
r = self.master_replica.revert_unordered_batches()
1767-
logger.info('{} reverted {} batches before starting catch up for '
1767+
logger.trace('{} reverted {} batches before starting catch up for '
17681768
'ledger {}'.format(self, r, ledger_id))
17691769

17701770
def postTxnFromCatchupAddedToLedger(self, ledger_id: int, txn: Any):
@@ -2286,12 +2286,12 @@ def checkPerformance(self) -> Optional[bool]:
22862286
self.view_changer.on_master_degradation()
22872287
return False
22882288
else:
2289-
logger.debug("{}'s master has higher performance than backups".
2289+
logger.trace("{}'s master has higher performance than backups".
22902290
format(self))
22912291
return True
22922292

22932293
def checkNodeRequestSpike(self):
2294-
logger.debug("{} checking its request amount".format(self))
2294+
logger.trace("{} checking its request amount".format(self))
22952295

22962296
if not self.isParticipating:
22972297
return
@@ -2640,7 +2640,7 @@ def sendReplyToClient(self, reply, reqKey):
26402640
if self.isProcessingReq(*reqKey):
26412641
sender = self.requestSender[reqKey]
26422642
if sender:
2643-
logger.debug(
2643+
logger.trace(
26442644
'{} sending reply for {} to client'.format(
26452645
self, reqKey))
26462646
self.transmitToClient(reply, self.requestSender[reqKey])

plenum/server/notifier_plugin_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def sendMessageUponSuspiciousSpike(
6666
assert 'enabled' in config
6767

6868
if not (enabled and config['enabled']):
69-
logger.debug('Suspicious Spike check is disabled')
69+
logger.trace('Suspicious Spike check is disabled')
7070
return None
7171

7272
coefficient = config['coefficient']

plenum/server/propagator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def tryForwarding(self, request: Request):
273273
# to move ahead
274274
self.forward(request)
275275
else:
276-
logger.debug("{} not forwarding request {} to its replicas "
276+
logger.trace("{} not forwarding request {} to its replicas "
277277
"since {}".format(self, request, cannot_reason_msg))
278278

279279
def request_propagates(self, req_keys):

plenum/server/replica.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ def trackBatches(self, pp: PrePrepare, prevStateRootHash):
650650
# pp.discarded indicates the index from where the discarded requests
651651
# starts hence the count of accepted requests, prevStateRoot is
652652
# tracked to revert this PRE-PREPARE
653-
self.logger.debug('{} tracking batch for {} with state root {}'.format(
653+
self.logger.trace('{} tracking batch for {} with state root {}'.format(
654654
self, pp, prevStateRootHash))
655655
self.batches[(pp.viewNo, pp.ppSeqNo)] = [pp.ledgerId, pp.discarded,
656656
pp.ppTime, prevStateRootHash]
@@ -745,7 +745,7 @@ def create3PCBatch(self, ledger_id):
745745
rv = self.execute_hook(ReplicaHooks.CREATE_PPR, pre_prepare)
746746
pre_prepare = rv if rv is not None else pre_prepare
747747

748-
self.logger.debug('{} created a PRE-PREPARE with {} requests for ledger {}'.format(
748+
self.logger.trace('{} created a PRE-PREPARE with {} requests for ledger {}'.format(
749749
self, len(validReqs), ledger_id))
750750
self.lastPrePrepareSeqNo = ppSeqNo
751751
self.last_accepted_pre_prepare_time = tm
@@ -876,7 +876,7 @@ def _process_valid_preprepare(self, pre_prepare, sender):
876876
self.node.onBatchCreated(pre_prepare.ledgerId, state_root)
877877
# BLS multi-sig:
878878
self._bls_bft_replica.process_pre_prepare(pre_prepare, sender)
879-
self.logger.debug("{} saved shared multi signature for root".format(self, old_state_root))
879+
self.logger.trace("{} saved shared multi signature for root".format(self, old_state_root))
880880
self.trackBatches(pre_prepare, old_state_root)
881881
self.logger.debug("{} processed incoming PRE-PREPARE{}".format(self, key),
882882
extra={"tags": ["processing"]})
@@ -994,7 +994,7 @@ def processPrepare(self, prepare: Prepare, sender: str) -> None:
994994
else:
995995
# TODO let's have isValidPrepare throw an exception that gets
996996
# handled and possibly logged higher
997-
self.logger.debug("{} cannot process incoming PREPARE".format(self))
997+
self.logger.trace("{} cannot process incoming PREPARE".format(self))
998998
except SuspiciousNode as ex:
999999
self.node.reportSuspiciousNodeEx(ex)
10001000

@@ -1760,7 +1760,7 @@ def markCheckPointStable(self, seqNo):
17601760
return
17611761
self.h = seqNo
17621762
for k in previousCheckpoints:
1763-
self.logger.debug("{} removing previous checkpoint {}".format(self, k))
1763+
self.logger.trace("{} removing previous checkpoint {}".format(self, k))
17641764
self.checkpoints.pop(k)
17651765
self._gc((self.viewNo, seqNo))
17661766
self.logger.debug("{} marked stable checkpoint {}".format(self, (s, e)))
@@ -1821,7 +1821,7 @@ def processStashedCheckpoints(self, key):
18211821
self._clear_prev_view_stashed_checkpoints()
18221822

18231823
if key not in self.stashedRecvdCheckpoints.get(self.viewNo, {}):
1824-
self.logger.debug("{} have no stashed checkpoints for {}")
1824+
self.logger.trace("{} have no stashed checkpoints for {}")
18251825
return 0
18261826

18271827
stashed = self.stashedRecvdCheckpoints[self.viewNo][key]
@@ -1861,9 +1861,9 @@ def _gc(self, till3PCKey):
18611861
for reqKey in pp.reqIdr:
18621862
reqKeys.add(reqKey)
18631863

1864-
self.logger.debug("{} found {} 3-phase keys to clean".
1864+
self.logger.trace("{} found {} 3-phase keys to clean".
18651865
format(self, len(tpcKeys)))
1866-
self.logger.debug("{} found {} request keys to clean".
1866+
self.logger.trace("{} found {} request keys to clean".
18671867
format(self, len(reqKeys)))
18681868

18691869
to_clean_up = (
@@ -1882,7 +1882,7 @@ def _gc(self, till3PCKey):
18821882

18831883
for request_key in reqKeys:
18841884
self.requests.free(request_key)
1885-
self.logger.debug('{} freed request {} from previous checkpoints'
1885+
self.logger.trace('{} freed request {} from previous checkpoints'
18861886
.format(self, request_key))
18871887

18881888
self.compact_ordered()
@@ -2139,7 +2139,7 @@ def _request_three_phase_msg(self, three_pc_key: Tuple[int, int],
21392139
return False
21402140

21412141
# TODO: Using a timer to retry would be a better thing to do
2142-
self.logger.debug('{} requesting {} for {} from {}'.format(
2142+
self.logger.trace('{} requesting {} for {} from {}'.format(
21432143
self, msg_type, three_pc_key, recipients))
21442144
# An optimisation can be to request PRE-PREPARE from f+1 or
21452145
# f+x (f+x<2f) nodes only rather than 2f since only 1 correct
@@ -2344,7 +2344,7 @@ def send(self, msg, stat=None) -> None:
23442344
:param rid: remote id of one recipient (sends to all recipients if None)
23452345
:param msg: the message to send
23462346
"""
2347-
self.logger.debug("{} sending {}".format(self, msg.__class__.__name__),
2347+
self.logger.trace("{} sending {}".format(self, msg.__class__.__name__),
23482348
extra={"cli": True, "tags": ['sending']})
23492349
self.logger.trace("{} sending {}".format(self, msg))
23502350
if stat:
@@ -2393,7 +2393,7 @@ def _remove_till_caught_up_3pc(self, last_caught_up_3PC):
23932393
if compare_3PC_keys(key, last_caught_up_3PC) >= 0:
23942394
outdated_pre_prepares[key] = pp
23952395

2396-
self.logger.debug('{} going to remove messages for {} 3PC keys'.format(
2396+
self.logger.trace('{} going to remove messages for {} 3PC keys'.format(
23972397
self, len(outdated_pre_prepares)))
23982398

23992399
for key, pp in outdated_pre_prepares.items():
@@ -2417,7 +2417,7 @@ def _remove_ordered_from_queue(self, last_caught_up_3PC=None):
24172417
compare_3PC_keys((msg.viewNo, msg.ppSeqNo), last_caught_up_3PC) >= 0):
24182418
to_remove.append(i)
24192419

2420-
self.logger.debug('{} going to remove {} Ordered messages from outbox'.format(self, len(to_remove)))
2420+
self.logger.trace('{} going to remove {} Ordered messages from outbox'.format(self, len(to_remove)))
24212421

24222422
# Removing Ordered from queue but returning `Ordered` in order that
24232423
# they should be processed.

stp_core/loop/looper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def __init__(self,
122122

123123
for sigName in self.signals:
124124
try:
125-
logger.debug("Setting handler for {}".format(sigName))
125+
logger.trace("Setting handler for {}".format(sigName))
126126
sigNum = getattr(signal, sigName)
127127
setSignal(sigNum, self.handleSignal)
128128
except RuntimeError as e:

stp_zmq/kit_zstack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def maintainConnections(self, force=False):
4646
else self.config.RETRY_TIMEOUT_RESTRICTED)
4747
missing = self.connectToMissing()
4848
self.retryDisconnected(exclude=missing)
49-
logger.debug("{} next check for retries in {:.2f} seconds"
49+
logger.trace("{} next check for retries in {:.2f} seconds"
5050
.format(self, self.nextCheck - now))
5151
return True
5252

stp_zmq/zstack.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -654,13 +654,13 @@ def sendPingPong(self, remote: Union[str, Remote], is_ping=True):
654654
def handlePingPong(self, msg, frm, ident):
655655
if msg in (self.pingMessage, self.pongMessage):
656656
if msg == self.pingMessage:
657-
logger.debug('{} got ping from {}'.format(self, frm))
657+
logger.trace('{} got ping from {}'.format(self, frm))
658658
self.sendPingPong(frm, is_ping=False)
659659

660660
if msg == self.pongMessage:
661661
if ident in self.remotesByKeys:
662662
self.remotesByKeys[ident].setConnected()
663-
logger.debug('{} got pong from {}'.format(self, frm))
663+
logger.trace('{} got pong from {}'.format(self, frm))
664664
return True
665665
return False
666666

@@ -713,7 +713,7 @@ def transmit(self, msg, uid, timeout=None, serialized=False):
713713
msg = self.prepare_to_send(msg)
714714
# socket.send(self.signedMsg(msg), flags=zmq.NOBLOCK)
715715
socket.send(msg, flags=zmq.NOBLOCK)
716-
logger.debug('{} transmitting message {} to {}'
716+
logger.trace('{} transmitting message {} to {}'
717717
.format(self, msg, uid))
718718
if not remote.isConnected and msg not in self.healthMessages:
719719
logger.debug('Remote {} is not connected - '

0 commit comments

Comments
 (0)