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

Jump to bottom

Hypervisor dmsg tab. #415

Merged
merged 15 commits into from
Jun 30, 2020
Merged

Hypervisor dmsg tab. #415

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a9d269f
Format: pull in updated dmsg.
evanlinjin Jun 22, 2020
650bc6e
Initial work on dmsg endpoint for hypervisor.
evanlinjin Jun 22, 2020
4dbc6bb
Added tests for dmsg tracker manager.
evanlinjin Jun 25, 2020
1e2d188
Integrated DmsgTrackerManager into Hypervisor.
evanlinjin Jun 26, 2020
7ad7d0a
Updated dependencies.
evanlinjin Jun 26, 2020
bcd64f9
Merge origin/develop
evanlinjin Jun 26, 2020
38d808b
Hypervisor /api/dmsg endpoint should not show disconnected visors.
evanlinjin Jun 29, 2020
ce88d4c
Fix segmentation fault caused by incorrect address resolver init logi…
evanlinjin Jun 29, 2020
ad21b5c
Improved stcpr/stcph init logic in snet.
evanlinjin Jun 29, 2020
649fdd5
hypervisor.DmsgTrackerManager now sorts outputs of .GetBulk
evanlinjin Jun 29, 2020
d702e14
Make hypervisor.DmsgTrackerManager default values as constants.
evanlinjin Jun 29, 2020
c3a6650
Update cmd/hypervisor/commands/root.go
evanlinjin Jun 30, 2020
1b76c68
Merge origin/develop
evanlinjin Jun 30, 2020
aa5b5d7
Merge branch 'feature/hv-dmsg-tab-#407' of github.com:evanlinjin/skyw…
evanlinjin Jun 30, 2020
a8e11d1
Changes as suggested by @nkryuchkov
evanlinjin Jun 30, 2020
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
66 changes: 34 additions & 32 deletions cmd/hypervisor/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package commands

import (
"context"
"fmt"
"net/http"
"os"
Expand Down Expand Up @@ -50,6 +51,9 @@ var rootCmd = &cobra.Command{
Use: "hypervisor",
Short: "Manages Skywire Visors",
Run: func(_ *cobra.Command, args []string) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

if _, err := buildinfo.Get().WriteTo(os.Stdout); err != nil {
log.Printf("Failed to output build info: %v", err)
}
Expand All @@ -72,29 +76,29 @@ var rootCmd = &cobra.Command{
log.Fatalf("Failed to obtain embedded static files: %v", err)
}

dmsgC := prepareDmsg(conf)

// Prepare hypervisor.
hv, err := hypervisor.New(assets, conf, restartCtx)
hv, err := hypervisor.New(conf, assets, restartCtx, dmsgC)
if err != nil {
log.Fatalln("Failed to start hypervisor:", err)
}

if mock {
prepareMockData(hv)
serveMockData(hv)
} else {
prepareDmsg(hv, conf)
serveDmsg(ctx, hv, conf)
}

// Serve HTTP(s).
log := log.
WithField("addr", conf.HTTPAddr).
WithField("tls", conf.EnableTLS)
log.WithField("addr", conf.HTTPAddr).
WithField("tls", conf.EnableTLS).
Info("Serving hypervisor...")

log.Info("Serving hypervisor...")

if conf.EnableTLS {
err = http.ListenAndServeTLS(conf.HTTPAddr, conf.TLSCertFile, conf.TLSKeyFile, hv)
if handler := hv.HTTPHandler(); conf.EnableTLS {
err = http.ListenAndServeTLS(conf.HTTPAddr, conf.TLSCertFile, conf.TLSKeyFile, handler)
} else {
err = http.ListenAndServe(conf.HTTPAddr, hv)
err = http.ListenAndServe(conf.HTTPAddr, handler)
}

if err != nil {
Expand All @@ -117,7 +121,25 @@ func prepareConfig(args []string) (conf hypervisor.Config) {
return conf
}

func prepareMockData(hv *hypervisor.Hypervisor) {
func prepareDmsg(conf hypervisor.Config) *dmsg.Client {
dmsgC := dmsg.NewClient(conf.PK, conf.SK, disc.NewHTTP(conf.DmsgDiscovery), dmsg.DefaultConfig())
go dmsgC.Serve()

<-dmsgC.Ready()
return dmsgC
}

func serveDmsg(ctx context.Context, hv *hypervisor.Hypervisor, conf hypervisor.Config) {
go func() {
if err := hv.ServeRPC(ctx, conf.DmsgPort); err != nil {
log.WithError(err).Fatal("Failed to serve RPC client over dmsg.")
}
}()
log.WithField("addr", fmt.Sprintf("dmsg://%s:%d", conf.PK, conf.DmsgPort)).
evanlinjin marked this conversation as resolved.
Show resolved Hide resolved
Info("Serving RPC client over dmsg.")
}

func serveMockData(hv *hypervisor.Hypervisor) {
err := hv.AddMockData(hypervisor.MockConfig{
Visors: mockVisors,
MaxTpsPerVisor: mockMaxTps,
Expand All @@ -129,26 +151,6 @@ func prepareMockData(hv *hypervisor.Hypervisor) {
}
}

func prepareDmsg(hv *hypervisor.Hypervisor, conf hypervisor.Config) {
// Prepare dmsg client.
dmsgC := dmsg.NewClient(conf.PK, conf.SK, disc.NewHTTP(conf.DmsgDiscovery), dmsg.DefaultConfig())
go dmsgC.Serve()

dmsgL, err := dmsgC.Listen(conf.DmsgPort)
if err != nil {
log.WithField("addr", fmt.Sprintf("dmsg://%s:%d", conf.PK, conf.DmsgPort)).
Fatal("Failed to listen over dmsg.")
}
go func() {
if err := hv.ServeRPC(dmsgC, dmsgL); err != nil {
log.WithError(err).
Fatal("Failed to serve RPC client over dmsg.")
}
}()
log.WithField("addr", fmt.Sprintf("dmsg://%s:%d", conf.PK, conf.DmsgPort)).
Info("Serving RPC client over dmsg.")
}

// Execute executes root CLI command.
func Execute() {
if err := rootCmd.Execute(); err != nil {
Expand Down
5 changes: 2 additions & 3 deletions cmd/hypervisor/statik/statik.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/SkycoinProject/skywire-mainnet
go 1.14

require (
github.com/SkycoinProject/dmsg v0.2.2
github.com/SkycoinProject/dmsg v0.2.3-0.20200626050336-ed5aa457d4be
github.com/SkycoinProject/skycoin v0.27.0
github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
Expand Down Expand Up @@ -41,4 +41,4 @@ require (
)

// Uncomment for tests with alternate branches of 'dmsg'
// replace github.com/SkycoinProject/dmsg => ../dmsg
//replace github.com/SkycoinProject/dmsg => ../dmsg
12 changes: 2 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/SkycoinProject/dmsg v0.0.0-20200306152741-acee74fa4514/go.mod h1:DzykXMLlx6Fx0fGjZsCIRas/MIvxW8DZpmDA6f2nCRk=
github.com/SkycoinProject/dmsg v0.2.2 h1:dVsenV5YvvP1Ptm0keproi/c6nA07FU6UntsFBga/74=
github.com/SkycoinProject/dmsg v0.2.2/go.mod h1:ze0XfdlLo3wtaK7caRqFipkRxEOZDqfgdPDARqG/jZs=
github.com/SkycoinProject/skycoin v0.26.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo=
github.com/SkycoinProject/dmsg v0.2.3-0.20200626050336-ed5aa457d4be h1:VYNbR9IAiGTILYBNzk3FBSdiydBn0ZLVndO6UEQd+oY=
github.com/SkycoinProject/dmsg v0.2.3-0.20200626050336-ed5aa457d4be/go.mod h1:qLrCsFiggHokPHyHH8069v6DawaD16SiUc8ml9W7CEo=
github.com/SkycoinProject/skycoin v0.27.0 h1:N3IHxj8ossHOcsxLYOYugT+OaELLncYHJHxbbYLPPmY=
github.com/SkycoinProject/skycoin v0.27.0/go.mod h1:xqPLOKh5B6GBZlGA7B5IJfQmCy7mwimD9NlqxR3gMXo=
github.com/SkycoinProject/skywire-mainnet v0.0.0-20200309204032-14af5342da86/go.mod h1:xuOpE5ZZU2kR39u0tJWtOpak/sJpnEFj1HpTxtyPU/A=
github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a h1:6nHCJqh7trsuRcpMC5JmtDukUndn2VC9sY64K6xQ7hQ=
github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a/go.mod h1:IaE1dxncLQs4RJcQTZPikJfAZY4szH87u2h0lT0SDuM=
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
Expand Down Expand Up @@ -145,10 +142,8 @@ github.com/libp2p/go-reuseport v0.0.1 h1:7PhkfH73VXfPJYKQ6JwS5I/eVcoyYi9IMNGc6FW
github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
Expand Down Expand Up @@ -219,7 +214,6 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
github.com/skycoin/skycoin v0.26.0/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
Expand Down Expand Up @@ -263,7 +257,6 @@ github.com/xtaci/kcp-go v4.3.4+incompatible h1:T56s9GLhx+KZUn5T8aO2Didfa4uTYvjeV
github.com/xtaci/kcp-go v4.3.4+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
Expand Down Expand Up @@ -309,7 +302,6 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand Down
Loading