Skip to content
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

Jump to bottom

Stop sending request after shutdown #7405

Merged
merged 1 commit into from
May 8, 2023
Merged

Stop sending request after shutdown #7405

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
20 changes: 12 additions & 8 deletions src/tribler/gui/core_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from tribler.gui.app_manager import AppManager
from tribler.gui.event_request_manager import EventRequestManager
from tribler.gui.exceptions import CoreConnectTimeoutError, CoreCrashedError
from tribler.gui.network.request_manager import request_manager
from tribler.gui.network.request_manager import SHUTDOWN_ENDPOINT, request_manager
from tribler.gui.utilities import connect

API_PORT_CHECK_INTERVAL = 100 # 0.1 seconds between attempts to retrieve Core API port
Expand Down Expand Up @@ -229,17 +229,21 @@ def stop(self, quit_app_on_core_finished=True):
self.events_manager.shutting_down = True

def shutdown_request_processed(response):
self._logger.info(f"Shutdown request was processed by Core. Response: {response}")
self._logger.info(f"{SHUTDOWN_ENDPOINT} request was processed by Core. Response: {response}")

def send_shutdown_request(initial=False):
if initial:
self._logger.info("Sending shutdown request to Tribler Core")
self._logger.info(f"Sending {SHUTDOWN_ENDPOINT} request to Tribler Core")
else:
self._logger.warning("Re-sending shutdown request to Tribler Core")

request = request_manager.put("shutdown", shutdown_request_processed,
priority=QNetworkRequest.HighPriority)
request.cancellable = False
self._logger.warning(f"Re-sending {SHUTDOWN_ENDPOINT} request to Tribler Core")

request = request_manager.put(
endpoint=SHUTDOWN_ENDPOINT,
on_success=shutdown_request_processed,
priority=QNetworkRequest.HighPriority
)
if request:
request.cancellable = False

send_shutdown_request(initial=True)

Expand Down
21 changes: 12 additions & 9 deletions src/tribler/gui/dialogs/addtopersonalchanneldialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,18 @@ def on_item_expanded(self, item):
self.load_channel(channel_id)

def load_channel(self, channel_id):
request = request_manager.get(f"channels/mychannel/{channel_id}",
on_success=lambda result: self.on_channel_contents(result, channel_id),
url_params={
"metadata_type": [CHANNEL_TORRENT, COLLECTION_NODE],
"first": 1,
"last": 1000,
"exclude_deleted": True,
})
self.root_requests_list.append(request)
request = request_manager.get(
f"channels/mychannel/{channel_id}",
on_success=lambda result: self.on_channel_contents(result, channel_id),
url_params={
"metadata_type": [CHANNEL_TORRENT, COLLECTION_NODE],
"first": 1,
"last": 1000,
"exclude_deleted": True,
}
)
if request:
self.root_requests_list.append(request)

def get_selected_channel_id(self):
selected = self.dialog_widget.channels_tree_wt.selectedItems()
Expand Down
8 changes: 6 additions & 2 deletions src/tribler/gui/dialogs/startdownloaddialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,12 @@ def perform_files_request(self):
params = {'uri': self.download_uri}
if direct:
params['hops'] = 0
self.rest_request = request_manager.get('torrentinfo', on_success=self.on_received_metainfo,
url_params=params, capture_errors=False)
self.rest_request = request_manager.get(
'torrentinfo',
on_success=self.on_received_metainfo,
url_params=params,
capture_errors=False
)

if self.metainfo_retries <= METAINFO_MAX_RETRIES:
fetch_mode = tr("directly") if direct else tr("anonymously")
Expand Down
43 changes: 28 additions & 15 deletions src/tribler/gui/network/request_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
from tribler.gui.network.request import DATA_TYPE, Request
from tribler.gui.utilities import connect

SHUTDOWN_ENDPOINT = "shutdown"


class RequestManager(QNetworkAccessManager):
"""
Expand Down Expand Up @@ -46,13 +48,12 @@ def get(self,
data: DATA_TYPE = None,
capture_errors: bool = True,
priority: int = QNetworkRequest.NormalPriority,
raw_response: bool = False) -> Request:
raw_response: bool = False) -> Optional[Request]:

request = Request(endpoint=endpoint, on_success=on_success, url_params=url_params, data=data,
capture_errors=capture_errors, priority=priority, raw_response=raw_response,
method=Request.GET)
self.add(request)
return request
return self.add(request)

def post(self,
endpoint: str,
Expand All @@ -61,7 +62,7 @@ def post(self,
data: DATA_TYPE = None,
capture_errors: bool = True,
priority: int = QNetworkRequest.NormalPriority,
raw_response: bool = False) -> Request:
raw_response: bool = False) -> Optional[Request]:

request = Request(endpoint=endpoint, on_success=on_success, url_params=url_params, data=data,
capture_errors=capture_errors, priority=priority, raw_response=raw_response,
Expand All @@ -76,13 +77,12 @@ def put(self,
data: DATA_TYPE = None,
capture_errors: bool = True,
priority: int = QNetworkRequest.NormalPriority,
raw_response: bool = False) -> Request:
raw_response: bool = False) -> Optional[Request]:

request = Request(endpoint=endpoint, on_success=on_success, url_params=url_params, data=data,
capture_errors=capture_errors, priority=priority, raw_response=raw_response,
method=Request.PUT)
self.add(request)
return request
return self.add(request)

def patch(self,
endpoint: str,
Expand All @@ -91,13 +91,12 @@ def patch(self,
data: DATA_TYPE = None,
capture_errors: bool = True,
priority: int = QNetworkRequest.NormalPriority,
raw_response: bool = False) -> Request:
raw_response: bool = False) -> Optional[Request]:

request = Request(endpoint=endpoint, on_success=on_success, url_params=url_params, data=data,
capture_errors=capture_errors, priority=priority, raw_response=raw_response,
method=Request.PATCH)
self.add(request)
return request
return self.add(request)

def delete(self,
endpoint: str,
Expand All @@ -106,15 +105,18 @@ def delete(self,
data: DATA_TYPE = None,
capture_errors: bool = True,
priority: int = QNetworkRequest.NormalPriority,
raw_response: bool = False) -> Request:
raw_response: bool = False) -> Optional[Request]:

request = Request(endpoint=endpoint, on_success=on_success, url_params=url_params, data=data,
capture_errors=capture_errors, priority=priority, raw_response=raw_response,
method=Request.DELETE)
self.add(request)
return request
return self.add(request)

def add(self, request: Request) -> Optional[Request]:
if self._is_in_shutting_down(request):
# Do not send requests when Tribler is shutting down
return None

def add(self, request: Request):
# Set last request id
self.last_request_id += 1
request.id = self.last_request_id
Expand Down Expand Up @@ -144,13 +146,14 @@ def add(self, request: Request):
buf.setParent(request.reply)

connect(request.reply.finished, request.on_finished)
return request

def remove(self, request: Request):
self.active_requests.discard(request)

def show_error(self, request: Request, data: Dict) -> str:
text = self.get_message_from_error(data)
if self.window.core_manager.shutting_down:
if self._is_in_shutting_down(request):
return ''

text = f'An error occurred during the request "{request}":\n\n{text}'
Expand Down Expand Up @@ -182,6 +185,16 @@ def clear(self):
if request.cancellable:
request.cancel()

def _is_in_shutting_down(self, request: Request) -> bool:
""" Check if the Tribler is in shutting down state."""
if request.endpoint == SHUTDOWN_ENDPOINT:
return False

if not self.window or not self.window.core_manager:
return False

return self.window.core_manager.shutting_down

def _drop_timed_out_requests(self):
for req in list(self.active_requests):
is_time_to_cancel = time() - req.time > self.timeout_interval
Expand Down