Skip to content
This repository has been archived by the owner on Aug 14, 2019. It is now read-only.

bug fix in +nap:to #1128

Merged
merged 7 commits into from
Apr 1, 2019
Merged

bug fix in +nap:to #1128

merged 7 commits into from
Apr 1, 2019

Conversation

yosoyubik
Copy link
Contributor

Fixes #1100 (a bug in +nap:to affecting three-item queues)
Unit tests added in /tests/sys/hoon/qeu

Copy link
Contributor

@belisarius222 belisarius222 left a comment

Choose a reason for hiding this comment

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

@yosoyubik Thank you! This is good work and an important fix. I requested a minor cleanup in the tests, but this looks good and should be ready to merge afterward.

@joemfb I'm not sure what the proper git procedure is here: edit the PR to be against hotfix? Seems like a good candidate for an OTA update. I'm happy to shepherd this in however you'd like.

@vvisigoth @philipcmonk The queue bug fixed by this PR could be the cause of our long-standing one-way connectivity issues (https://github.com/urbit/arvo/issues/717, https://github.com/urbit/arvo/issues/554, #170). Ames performs ~(nap to ...) on its packet queue when acking a packet in +bine:pu.

I suspect it's worth writing a reproduction case by constructing a three-element packet queue, getting Ames to ack a packet, and then seeing if we can confirm downstream OWC. We could then apply this fix and confirm the lack of OWC.

tests/sys/hoon/qeu.hoon Outdated Show resolved Hide resolved
Copy link
Contributor

@belisarius222 belisarius222 left a comment

Choose a reason for hiding this comment

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

LGTM. Waiting on git instructions before merging

@ixv
Copy link
Contributor

ixv commented Apr 1, 2019

The queue bug fixed by this PR could be the cause of our long-standing one-way connectivity issues

Woah

It looks like this function is only used twice: in ames and eyre. Seems unlikely that anything is depending on its brokenness, hotfix is probably a good idea.

@joemfb
Copy link
Member

joemfb commented Apr 1, 2019

Agreed, the right thing is to edit a PR to target the appropriate branch. It seems like hotfix is appropriate in this case. Thanks, @yosoyubik!

@yosoyubik yosoyubik changed the base branch from master to hotfix April 1, 2019 10:59
@yosoyubik
Copy link
Contributor Author

Thank you guys! I didn't expect this to be useful at all... There I was just making a small tic-tac-toe app and look at this :D

I have just edited the PR to target hotfix, let me know if something else is needed.

@ixv ixv merged commit f4ddbc9 into urbit:hotfix Apr 1, 2019
@ixv ixv mentioned this pull request Apr 3, 2019
@ixv ixv mentioned this pull request Apr 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants