Skip to content

Conversation

kallewoof
Copy link
Contributor

@kallewoof kallewoof commented May 9, 2018

This is a follow-up PR to #10267, and addresses #10267 (comment).

I am adding extra work for @jnewbery in #12755 here -- maybe I should just rebase on top of that, but not sure what the appropriate approach is here.

@laanwj
Copy link
Member

laanwj commented May 9, 2018

I am adding extra work for @jnewbery in #12755 here -- maybe I should just rebase on top of that, but not sure what the appropriate approach is here.

I (personally) prefer if PRs are more or less independent.
As having a web of dependencies between them makes it even harder to keep track of them.
On the other hand, #10267 is now in, and #12755 should probably be next.

@kallewoof
Copy link
Contributor Author

@laanwj Makes sense. I will leave this as is and adjust it once #12755 is merged.

@promag
Copy link
Contributor

promag commented May 9, 2018

utACK 6f10309.

BTW couldn't cs_args be locked the whole time?

@jnewbery
Copy link
Contributor

jnewbery commented May 9, 2018

concept ACK (and quick skim utACK). Will review & test after #12755 is merged.

@laanwj
Copy link
Member

laanwj commented May 9, 2018

#12755 is merged, please rebase

kallewoof added 2 commits May 10, 2018 11:02
Since -includeconf cannot be used recursively, the user would not see feedback that an -includeconf
in an -includeconf'd file was silently ignored.
@kallewoof kallewoof force-pushed the includeconf-warn-nonrecursive branch from 6f10309 to 2352aa9 Compare May 10, 2018 02:13
@kallewoof
Copy link
Contributor Author

Rebased.

@kallewoof
Copy link
Contributor Author

@promag Is it better locking the whole time?

@laanwj
Copy link
Member

laanwj commented May 10, 2018

@promag Is it better locking the whole time?

I don't know what the potential races here are, but If everything else is the same, keeping the lock closely around the section where it is needed is preferable. Also: calls such as GetArgs take their own lock, so already holding it is sloppy.

@promag
Copy link
Contributor

promag commented May 10, 2018

@laanwj I mean, ReadConfigFiles should be an atomic operation right?

@laanwj
Copy link
Member

laanwj commented May 11, 2018

ReadConfigFiles should be an atomic operation right?

As far as I know we don't really make any assumptions in that regard right now, but in sane API design I think that makes sense.

@kallewoof
Copy link
Contributor Author

I can try moving the lock to the top of the method and remove it elsewhere. I am concerned it may cause deadlocks though.

@kallewoof
Copy link
Contributor Author

ba5b9fc

@promag
Copy link
Contributor

promag commented May 11, 2018

@kallewoof I think it's great to change that but in a different PR. Commit 2352aa9 is enough here. Sorry for asking here!

@kallewoof kallewoof force-pushed the includeconf-warn-nonrecursive branch from ba5b9fc to 2352aa9 Compare May 11, 2018 12:20
@kallewoof
Copy link
Contributor Author

Yeah doesn't seem as simple as I hoped. Dropping ba5b9fc.

@laanwj
Copy link
Member

laanwj commented May 14, 2018

utACK 2352aa9

@laanwj laanwj merged commit 2352aa9 into bitcoin:master May 14, 2018
laanwj added a commit that referenced this pull request May 14, 2018
2352aa9 test: Ensure that recursive -includeconf produces appropriate warnings (Karl-Johan Alm)
c5bcc7d util: warn about recursive -includeconf arguments in configuration files (Karl-Johan Alm)

Pull request description:

  This is a follow-up PR to #10267, and addresses #10267 (comment).

  ~~I am adding extra work for @jnewbery in #12755 here -- maybe I should just rebase on top of that, but not sure what the appropriate approach is here.~~

Tree-SHA512: 87f0c32436b70424e33616ffb88d7cb699f90d6a583a10237e224b28fc936d6a9df95536c8c52ee8546b3942da92b2a357e61bf87e00d1462bc10d46d3bee352
jasonbcox pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Sep 27, 2019
Summary:
2352aa9 test: Ensure that recursive -includeconf produces appropriate warnings (Karl-Johan Alm)
c5bcc7d util: warn about recursive -includeconf arguments in configuration files (Karl-Johan Alm)

Pull request description:

  This is a follow-up PR to #10267, and addresses bitcoin/bitcoin#10267 (comment).

  ~~I am adding extra work for @jnewbery in #12755 here -- maybe I should just rebase on top of that, but not sure what the appropriate approach is here.~~

Tree-SHA512: 87f0c32436b70424e33616ffb88d7cb699f90d6a583a10237e224b28fc936d6a9df95536c8c52ee8546b3942da92b2a357e61bf87e00d1462bc10d46d3bee352

Backport of Core PR13197
bitcoin/bitcoin#13197

Test Plan:
  make check
  test_runner.py

Reviewers: deadalnix, Fabien, jasonbcox, O1 Bitcoin ABC, #bitcoin_abc

Reviewed By: deadalnix, O1 Bitcoin ABC, #bitcoin_abc

Differential Revision: https://reviews.bitcoinabc.org/D4118
@kallewoof kallewoof deleted the includeconf-warn-nonrecursive branch October 17, 2019 08:36
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jun 18, 2021
…calls

2352aa9 test: Ensure that recursive -includeconf produces appropriate warnings (Karl-Johan Alm)
c5bcc7d util: warn about recursive -includeconf arguments in configuration files (Karl-Johan Alm)

Pull request description:

  This is a follow-up PR to bitcoin#10267, and addresses bitcoin#10267 (comment).

  ~~I am adding extra work for @jnewbery in bitcoin#12755 here -- maybe I should just rebase on top of that, but not sure what the appropriate approach is here.~~

Tree-SHA512: 87f0c32436b70424e33616ffb88d7cb699f90d6a583a10237e224b28fc936d6a9df95536c8c52ee8546b3942da92b2a357e61bf87e00d1462bc10d46d3bee352
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jun 24, 2021
…calls

2352aa9 test: Ensure that recursive -includeconf produces appropriate warnings (Karl-Johan Alm)
c5bcc7d util: warn about recursive -includeconf arguments in configuration files (Karl-Johan Alm)

Pull request description:

  This is a follow-up PR to bitcoin#10267, and addresses bitcoin#10267 (comment).

  ~~I am adding extra work for @jnewbery in bitcoin#12755 here -- maybe I should just rebase on top of that, but not sure what the appropriate approach is here.~~

Tree-SHA512: 87f0c32436b70424e33616ffb88d7cb699f90d6a583a10237e224b28fc936d6a9df95536c8c52ee8546b3942da92b2a357e61bf87e00d1462bc10d46d3bee352
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jun 26, 2021
…calls

2352aa9 test: Ensure that recursive -includeconf produces appropriate warnings (Karl-Johan Alm)
c5bcc7d util: warn about recursive -includeconf arguments in configuration files (Karl-Johan Alm)

Pull request description:

  This is a follow-up PR to bitcoin#10267, and addresses bitcoin#10267 (comment).

  ~~I am adding extra work for @jnewbery in bitcoin#12755 here -- maybe I should just rebase on top of that, but not sure what the appropriate approach is here.~~

Tree-SHA512: 87f0c32436b70424e33616ffb88d7cb699f90d6a583a10237e224b28fc936d6a9df95536c8c52ee8546b3942da92b2a357e61bf87e00d1462bc10d46d3bee352
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jun 26, 2021
…calls

2352aa9 test: Ensure that recursive -includeconf produces appropriate warnings (Karl-Johan Alm)
c5bcc7d util: warn about recursive -includeconf arguments in configuration files (Karl-Johan Alm)

Pull request description:

  This is a follow-up PR to bitcoin#10267, and addresses bitcoin#10267 (comment).

  ~~I am adding extra work for @jnewbery in bitcoin#12755 here -- maybe I should just rebase on top of that, but not sure what the appropriate approach is here.~~

Tree-SHA512: 87f0c32436b70424e33616ffb88d7cb699f90d6a583a10237e224b28fc936d6a9df95536c8c52ee8546b3942da92b2a357e61bf87e00d1462bc10d46d3bee352
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jun 28, 2021
…calls

2352aa9 test: Ensure that recursive -includeconf produces appropriate warnings (Karl-Johan Alm)
c5bcc7d util: warn about recursive -includeconf arguments in configuration files (Karl-Johan Alm)

Pull request description:

  This is a follow-up PR to bitcoin#10267, and addresses bitcoin#10267 (comment).

  ~~I am adding extra work for @jnewbery in bitcoin#12755 here -- maybe I should just rebase on top of that, but not sure what the appropriate approach is here.~~

Tree-SHA512: 87f0c32436b70424e33616ffb88d7cb699f90d6a583a10237e224b28fc936d6a9df95536c8c52ee8546b3942da92b2a357e61bf87e00d1462bc10d46d3bee352
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants