Improvements

cluster.go

@@ -35,7 +35,7 @@ type ClusterAPI interface {
 	List(ctx context.Context, opts ...ListOption) ([]Cluster, error)
 
 	// Remove destroys clusters permanently.
-	Remove(ctx context.Context, names ...string) error
+	Remove(ctx context.Context, force bool, names ...string) error
 }
 
 // Cluster is a group of instances connected in a p2p network. They can be

cmd/labctl/command/cluster.go

@@ -101,6 +101,12 @@ var clusterCommand = cli.Command{
 			Aliases:   []string{"rm"},
 			Usage:     "Remove clusters.",
 			Action:    removeClustersAction,
+			Flags: []cli.Flag{
+				cli.BoolFlag{
+					Name:  "force",
+					Usage: "force removal to ignore possible staleness and other misc issues",
+				},
+			},
 		},
 	},
 }
@@ -251,7 +257,7 @@ func removeClustersAction(c *cli.Context) error {
 	}
 
 	ctx := cliutil.CommandContext(c)
-	err = control.Cluster().Remove(ctx, names...)
+	err = control.Cluster().Remove(ctx, c.Bool("force"), names...)
 	if err != nil {
 		return err
 	}

labapp/labapp.go

@@ -36,9 +36,10 @@ func New(ctx context.Context, root, addr string, port int, logger *zerolog.Logge
 	pctx, cancel := context.WithCancel(ctx)
 	p, err := peer.New(pctx, root, port, pdef)
 	if err != nil {
+		cancel()
 		return nil, err
 	}
-	closers = append(closers, &daemon.CancelCloser{cancel})
+	closers = append(closers, &daemon.CancelCloser{Cancel: cancel})
 
 	daemon, err := daemon.New("labapp", addr, logger,
 		approuter.New(p),

labd/controlapi/cluster.go

@@ -192,9 +192,10 @@ func (a *clusterAPI) List(ctx context.Context, opts ...p2plab.ListOption) ([]p2p
 type Event struct {
 }
 
-func (a *clusterAPI) Remove(ctx context.Context, names ...string) error {
+func (a *clusterAPI) Remove(ctx context.Context, force bool, names ...string) error {
 	req := a.client.NewRequest("DELETE", a.url("/clusters/delete")).
-		Option("names", strings.Join(names, ","))
+		Option("names", strings.Join(names, ",")).
+		Option("force", force)
 
 	resp, err := req.Send(ctx)
 	if err != nil {

labd/labd.go

@@ -99,9 +99,10 @@ func New(root, addr string, logger *zerolog.Logger, opts ...LabdOption) (*Labd,
 		Routing:            "nil",
 	})
 	if err != nil {
+		cancel()
 		return nil, errors.Wrap(err, "failed to create seeder peer")
 	}
-	closers = append(closers, &daemon.CancelCloser{cancel})
+	closers = append(closers, &daemon.CancelCloser{Cancel: cancel})
 
 	ts := transformers.New(filepath.Join(root, "transformers"), client.HTTPClient)
 	closers = append(closers, ts)

labd/routers/clusterrouter/router.go

@@ -172,7 +172,10 @@ func (s *router) putClustersLabel(ctx context.Context, w http.ResponseWriter, r
 
 func (s *router) deleteClusters(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
 	names := strings.Split(r.FormValue("names"), ",")
-
+	var force bool
+	if r.FormValue("force") != "" {
+		force = true
+	}
 	ctx, logger := logutil.WithResponseLogger(ctx, w)
 
 	// TODO: parallelize with different color loggers?
@@ -185,7 +188,7 @@ func (s *router) deleteClusters(ctx context.Context, w http.ResponseWriter, r *h
 			return errors.Wrapf(err, "failed to get cluster %q", name)
 		}
 
-		if cluster.Status != metadata.ClusterDestroying {
+		if cluster.Status != metadata.ClusterDestroying || force {
 			cluster.Status = metadata.ClusterDestroying
 			cluster, err = s.db.UpdateCluster(ctx, cluster)
 			if err != nil {

peer/peer.go

@@ -293,7 +293,7 @@ func (p *Peer) Report(ctx context.Context) (metadata.ReportNode, error) {
 	}
 
 	return metadata.ReportNode{
-		metadata.ReportBitswap{
+		Bitswap: metadata.ReportBitswap{
 			BlocksReceived:   stat.BlocksReceived,
 			DataReceived:     stat.DataReceived,
 			BlocksSent:       stat.BlocksSent,
@@ -302,7 +302,7 @@ func (p *Peer) Report(ctx context.Context) (metadata.ReportNode, error) {
 			DupDataReceived:  stat.DupDataReceived,
 			MessagesReceived: stat.MessagesReceived,
 		},
-		metadata.ReportBandwidth{
+		Bandwidth: metadata.ReportBandwidth{
 			Totals:    p.reporter.GetBandwidthTotals(),
 			Peers:     peers,
 			Protocols: p.reporter.GetBandwidthByProtocol(),