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

[dev] Optimize batch fetch method to boost throughput #269

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[dev] Optimize batch fetch method to boost throughput #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af59239
optimize batch fetch method to boost throughput
NiuBlibing Feb 8, 2023
58ba6da
Merge branch 'master' into optimize_next_requests
LuckyPigeon Jun 10, 2023
466288c
[fix] assertion error
LuckyPigeon Jun 21, 2023
d1674c6
[fix] assertion error
LuckyPigeon Jun 21, 2023
6300a38
[fix] assertion error
LuckyPigeon Jun 21, 2023
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
15 changes: 13 additions & 2 deletions src/scrapy_redis/spiders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def setup_redis(self, crawler=None):

# The idle signal is called when the spider has no requests left,
# that's when we will schedule new requests from redis queue
crawler.signals.connect(self.spider_idle, signal=signals.spider_idle)
crawler.signals.connect(self.fill_requests_queue, signal=signals.request_left_downloader)

def pop_list_queue(self, redis_key, batch_size):
with self.server.pipeline() as pipe:
Expand All @@ -112,11 +112,22 @@ def pop_priority_queue(self, redis_key, batch_size):
datas, _ = pipe.execute()
return datas

def fill_requests_queue(self):
need_size = self.crawler.engine.downloader.total_concurrency - \
len(self.crawler.engine.downloader.active) - len(self.crawler.engine.slot.scheduler.queue)
if need_size > 0:
self.logger.debug("Need to fill %i request(s)", need_size)
for req in self.__next_requests(need_size):
self.crawler.engine.crawl(req, spider=self)

def next_requests(self):
return self.__next_requests(self.redis_batch_size)

def __next_requests(self, redis_batch_size):
"""Returns a request to be scheduled or none."""
# XXX: Do we need to use a timeout here?
found = 0
datas = self.fetch_data(self.redis_key, self.redis_batch_size)
datas = self.fetch_data(self.redis_key, redis_batch_size)
for data in datas:
reqs = self.make_request_from_data(data)
if isinstance(reqs, Iterable):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_spiders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def test_via_from_crawler(self, connection):
myspider = MySpider.from_crawler(crawler)
assert myspider.server is server
connection.from_settings.assert_called_with(crawler.settings)
crawler.signals.connect.assert_called_with(myspider.spider_idle, signal=signals.spider_idle)
crawler.signals.connect.assert_called_with(myspider.fill_requests_queue, signal=signals.request_left_downloader)
# Second call does nothing.
server = myspider.server
crawler.signals.connect.reset_mock()
Expand Down