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

Merge Milestone 2 #219

Merged
merged 692 commits into from
Mar 10, 2020
Merged

Merge Milestone 2 #219

merged 692 commits into from
Mar 10, 2020

Conversation

nkryuchkov
Copy link
Contributor

@nkryuchkov nkryuchkov commented Mar 10, 2020

Did you run make format && make check? Yes

Partially fixes #159

Changes:

  • Resolved conflicts between milestone2 and master

jdknives and others added 30 commits January 28, 2020 14:14
Fix: Ensure transports are deregistered and removed when rm-tp is run.
Improve route group logging, fix route group closing procedure
Regarding memory leak. In the `Write` method of the route group we call
`writePacketAsync`. It returns `errCh` to us to wait the error from, this
channel is not buffered, so `writePacketAsync`'s goroutine actually blocks
while trying to pass error to this channel. But `Write` blocks on `select`
waiting either error from `errCh` or error from write deadline struct. And
if it gets deadline error, it just returns without waiting for any error from
`errCh`, making `writePacketAsync` block forever on sending to the channel.
And we might have had a lot of such running goroutines
志宇 and others added 21 commits March 7, 2020 00:26
Verify public key before requesting routes
Renamed `loop` to `routegroup` for hypervisor endpoints, function names, struct types and comments.
* Added defer statement to Updater.Update to revert u.updating value back to 0 after updating.
Remove logging of every packet contents
# Conflicts:
#	Makefile
#	README.md
#	ci_scripts/run-internal-tests.sh
#	cmd/apps/therealproxy-client/therealproxy-client.go
#	cmd/skywire-cli/commands/visor/gen-config.go
#	docker/images/visor/Dockerfile
#	go.mod
#	integration/InteractiveEnvironments.md
#	integration/generic/nodeA.json
#	integration/generic/nodeC.json
#	integration/test-proxy.sh
#	internal/skyenv/const.go
#	internal/therealproxy/client.go
#	pkg/hypervisor/hypervisor.go
#	pkg/hypervisor/hypervisor_test.go
#	pkg/hypervisor/user_manager.go
#	pkg/transport-discovery/client/client.go
#	pkg/transport/manager.go
#	pkg/transport/manager_test.go
#	pkg/visor/config.go
#	pkg/visor/rpc_test.go
#	pkg/visor/visor.go
#	pkg/visor/visor_test.go
#	vendor/github.com/mitchellh/colorstring/LICENSE
#	vendor/modules.txt
@nkryuchkov nkryuchkov merged commit 4078d17 into master Mar 10, 2020
@jdknives jdknives deleted the merge/m2-to-master branch March 10, 2020 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants