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.

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

Move torrent storages one by one #12035

Merged
merged 1 commit into from
Mar 13, 2020
Merged

Conversation

glassez
Copy link
Member

@glassez glassez commented Feb 20, 2020

Closes #9407.

@FranciscoPombal
Copy link
Member

FranciscoPombal commented Feb 21, 2020

Oof, this is one meaty PR, even has changes to the state machine by the looks of it... I will test later and report back.

Just out of curiosity, I did not look at the code yet, but does this fix #12040 by any chance or will it at least play nicely with a fix for it?

@glassez
Copy link
Member Author

glassez commented Feb 21, 2020

does this fix #12040 by any chance or will it at least play nicely with a fix for it?

It has nothing to do with #12040.
Seems #12040 is pure libtorrent issue...

@Ryrynz
Copy link

Ryrynz commented Feb 22, 2020

Is 4.1.10 going to be a thing? If it is can we get this in there?

src/base/bittorrent/torrenthandle.cpp Outdated Show resolved Hide resolved
src/base/bittorrent/torrenthandle.cpp Outdated Show resolved Hide resolved
src/base/bittorrent/torrenthandle.cpp Show resolved Hide resolved
src/base/bittorrent/session.cpp Outdated Show resolved Hide resolved
src/base/bittorrent/session.cpp Outdated Show resolved Hide resolved
src/base/bittorrent/session.h Outdated Show resolved Hide resolved
src/base/bittorrent/session.cpp Outdated Show resolved Hide resolved
src/base/bittorrent/session.cpp Outdated Show resolved Hide resolved
src/base/bittorrent/session.cpp Outdated Show resolved Hide resolved
src/base/bittorrent/session.h Show resolved Hide resolved
Copy link
Member

@Chocobo1 Chocobo1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably the last comment.

src/base/bittorrent/session.cpp Outdated Show resolved Hide resolved
@glassez
Copy link
Member Author

glassez commented Mar 6, 2020

I'm still sure it would be better to implement it in libtorrent, but I don't have the opportunity to do it seriously yet, so let's settle for this solution.
Does anyone have arguments to delay its merge until later releases?

Copy link
Member

@FranciscoPombal FranciscoPombal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm still sure it would be better to implement it in libtorrent, but I don't have the opportunity to do it seriously yet, so let's settle for this solution.
Does anyone have arguments to delay its merge until later releases?

From my testing everything seems OK. From my part, this can be part of the next release.

Side note: we already have a ton of fixes ready for commonly reported problems with 4.2.1. Why not release the new version sooner, rather than later? More fixes can ship in the release after that, let's not delay 4.2.2 any longer. IMO, the only real blocker are the recent libtorrent tracker/DHT/VPN connectivity issues, which are all being fixed for 1.2.5. Once that is out, I think qBittorrent 4.2.2 should be released as well.

@Ryrynz
Copy link

Ryrynz commented Mar 7, 2020

Not even sure you need to wait for 1.2.5, just build against the latest code. Those DHT/VPN issues have apparently been resolved. @arvidn any point in waiting for 1.2.5?

@arvidn
Copy link
Contributor

arvidn commented Mar 7, 2020

regarding moving files in parallel. Would anyone be interested in testing this patch? arvidn/libtorrent#4398
It will run fewer moves in parallel.

@arvidn
Copy link
Contributor

arvidn commented Mar 7, 2020

this patch to qbt is probably better though, come to think of it. As it's fixing the problem explicitly

@FranciscoPombal
Copy link
Member

@Ryrynz See this comment: arvidn/libtorrent#4388 (comment)

Once those issues are fixed, a new qBittorrent version could be released. This can happen regardless of waiting for the official cut of libtorrent 1.2.5, but I fully expect the release of 1.2.5 to coincide with the fixing of those issues, given their relevance.

@Ryrynz
Copy link

Ryrynz commented Mar 8, 2020

Seems 1.25 is only some days off roughly anyway. There's still some connectivity issues with 1.2.5, recommend Sledge waiting until this is fixed before releasing 4.2.2, would be nice if he was available within a short timeframe of Libtorrent being fixed of this issue as many are waiting on this release.

@glassez glassez merged commit 5127156 into qbittorrent:master Mar 13, 2020
@glassez glassez deleted the move-storage branch March 13, 2020 12:59
@glassez
Copy link
Member Author

glassez commented Mar 13, 2020

Well, let's start with it.

@glassez
Copy link
Member Author

glassez commented Mar 16, 2020

Actually it produces two different substates: Moving and Queued for moving. Seems we should really distinguish them (at least to show it to user). What do you say?

@Chocobo1
Copy link
Member

Seems we should really distinguish them (at least to show it to user). What do you say?

I think that helps users to understand what qbt is doing, might be a good idea.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

QB moves multiple complete torrents at a time, leading to super high IO contention.
6 participants