Skip to content

Fix: queue.get(block=False) can raise Empty #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kezhenxu94 merged 1 commit into from
Dec 11, 2020
Merged

Fix: queue.get(block=False) can raise Empty #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions skywalking/agent/protocol/grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import logging
from skywalking.loggings import logger
import traceback
from queue import Queue
from queue import Queue, Empty

import grpc

Expand Down Expand Up @@ -70,7 +70,10 @@ def on_error(self):
def report(self, queue: Queue, block: bool = True):
def generator():
while True:
segment = queue.get(block=block) # type: Segment
try:
segment = queue.get(block=block) # type: Segment
except Empty:
return

logger.debug('reporting segment %s', segment)

Expand Down
7 changes: 5 additions & 2 deletions skywalking/agent/protocol/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#

from skywalking.loggings import logger
from queue import Queue
from queue import Queue, Empty

from skywalking.agent import Protocol
from skywalking.client.http import HttpServiceManagementClient, HttpTraceSegmentReportService
Expand All @@ -41,7 +41,10 @@ def connected(self):
def report(self, queue: Queue, block: bool = True):
def generator():
while True:
segment = queue.get(block=block) # type: Segment
try:
segment = queue.get(block=block) # type: Segment
except Empty:
return

logger.debug('reporting segment %s', segment)

Expand Down
7 changes: 5 additions & 2 deletions skywalking/agent/protocol/kafka.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import logging
from skywalking.loggings import logger, getLogger
from queue import Queue
from queue import Queue, Empty

from skywalking import config
from skywalking.agent import Protocol
Expand Down Expand Up @@ -45,7 +45,10 @@ def heartbeat(self):
def report(self, queue: Queue, block: bool = True):
def generator():
while True:
segment = queue.get(block=block) # type: Segment
try:
segment = queue.get(block=block) # type: Segment
except Empty:
return

logger.debug('reporting segment %s', segment)

Expand Down