fix status

coadler · coadler · commit 0abe0a1ed9cf · 2023-02-08T23:44:24.000Z
diff --git a/cli/speedtest.go b/cli/speedtest.go
@@ -75,7 +75,7 @@ func speedtest() *cobra.Command {
 					if err != nil {
 						continue
 					}
-					status := conn.Status()
+					status := conn.Status(true)
 					if len(status.Peers()) != 1 {
 						continue
 					}
diff --git a/scaletest/agentconn/run.go b/scaletest/agentconn/run.go
@@ -87,7 +87,7 @@ func (r *Runner) Run(ctx context.Context, _ string, logs io.Writer) error {
 
 	// Ensure DERP for completeness.
 	if r.cfg.ConnectionMode == ConnectionModeDerp {
-		status := conn.Status()
+		status := conn.Status(true)
 		if len(status.Peers()) != 1 {
 			return xerrors.Errorf("check connection mode: expected 1 peer, got %d", len(status.Peers()))
 		}
@@ -141,9 +141,10 @@ func waitForDisco(ctx context.Context, logs io.Writer, conn *codersdk.WorkspaceA
 	for i := 0; i < pingAttempts; i++ {
 		_, _ = fmt.Fprintf(logs, "\tDisco ping attempt %d/%d...\n", i+1, pingAttempts)
 		pingCtx, cancel := context.WithTimeout(ctx, defaultRequestTimeout)
-		_, _, err := conn.Ping(pingCtx)
+		_, p2p, err := conn.Ping(pingCtx)
 		cancel()
 		if err == nil {
+			_, _ = fmt.Fprintf(logs, "\tDisco ping succeeded after %d attempts, p2p = %v\n", i+1, p2p)
 			break
 		}
 		if i == pingAttempts-1 {
@@ -171,11 +172,11 @@ func waitForDirectConnection(ctx context.Context, logs io.Writer, conn *codersdk
 
 	for i := 0; i < directConnectionAttempts; i++ {
 		_, _ = fmt.Fprintf(logs, "\tDirect connection check %d/%d...\n", i+1, directConnectionAttempts)
-		status := conn.Status()
+		status := conn.Status(true)
 
 		var err error
 		if len(status.Peers()) != 1 {
-			_, _ = fmt.Fprintf(logs, "\t\tExpected 1 peer, found %d", len(status.Peers()))
+			_, _ = fmt.Fprintf(logs, "\t\tExpected 1 peer, found %d\n", len(status.Peers()))
 			err = xerrors.Errorf("expected 1 peer, got %d", len(status.Peers()))
 		} else {
 			peer := status.Peer[status.Peers()[0]]
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -353,7 +353,7 @@ func (c *Conn) RemoveAllPeers() error {
 func (c *Conn) UpdateNodes(nodes []*Node) error {
 	c.mutex.Lock()
 	defer c.mutex.Unlock()
-	status := c.Status()
+	status := c.Status(true)
 	for _, peer := range c.netMap.Peers {
 		peerStatus, ok := status.Peer[peer.Key]
 		if !ok {
@@ -424,8 +424,8 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 }
 
 // Status returns the current ipnstate of a connection.
-func (c *Conn) Status() *ipnstate.Status {
-	sb := &ipnstate.StatusBuilder{}
+func (c *Conn) Status(wantPeers bool) *ipnstate.Status {
+	sb := &ipnstate.StatusBuilder{WantPeers: wantPeers}
 	c.wireguardEngine.UpdateStatus(sb)
 	return sb.Status()
 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func speedtest() *cobra.Command {`
`75`	`75`	`if err != nil {`
`76`	`76`	`continue`
`77`	`77`	`}`
`78`		`- status := conn.Status()`
	`78`	`+ status := conn.Status(true)`
`79`	`79`	`if len(status.Peers()) != 1 {`
`80`	`80`	`continue`
`81`	`81`	`}`