diff --git a/pkg/cli/testdata/zip/partial1_excluded b/pkg/cli/testdata/zip/partial1_excluded index 0e5166b9ead4..773b5cb225a4 100644 --- a/pkg/cli/testdata/zip/partial1_excluded +++ b/pkg/cli/testdata/zip/partial1_excluded @@ -8,7 +8,6 @@ using SQL connection URL: postgresql://... writing /dev/null requesting data for debug/events... writing: debug/events.json requesting data for debug/rangelog... writing: debug/rangelog.json -requesting data for debug/liveness... writing: debug/liveness.json requesting data for debug/settings... writing: debug/settings.json requesting data for debug/reports/problemranges... writing: debug/reports/problemranges.json retrieving SQL data for crdb_internal.cluster_queries... writing: debug/crdb_internal.cluster_queries.txt diff --git a/pkg/cli/testdata/zip/partial2 b/pkg/cli/testdata/zip/partial2 index b6a5ab49684f..228e2ac1b408 100644 --- a/pkg/cli/testdata/zip/partial2 +++ b/pkg/cli/testdata/zip/partial2 @@ -8,7 +8,6 @@ using SQL connection URL: postgresql://... writing /dev/null requesting data for debug/events... writing: debug/events.json requesting data for debug/rangelog... writing: debug/rangelog.json -requesting data for debug/liveness... writing: debug/liveness.json requesting data for debug/settings... writing: debug/settings.json requesting data for debug/reports/problemranges... writing: debug/reports/problemranges.json retrieving SQL data for crdb_internal.cluster_queries... writing: debug/crdb_internal.cluster_queries.txt diff --git a/pkg/cli/testdata/zip/testzip b/pkg/cli/testdata/zip/testzip index a359337a3a7c..861f9222e440 100644 --- a/pkg/cli/testdata/zip/testzip +++ b/pkg/cli/testdata/zip/testzip @@ -8,7 +8,6 @@ using SQL connection URL: postgresql://... writing /dev/null requesting data for debug/events... writing: debug/events.json requesting data for debug/rangelog... writing: debug/rangelog.json -requesting data for debug/liveness... writing: debug/liveness.json requesting data for debug/settings... writing: debug/settings.json requesting data for debug/reports/problemranges... writing: debug/reports/problemranges.json retrieving SQL data for crdb_internal.cluster_queries... writing: debug/crdb_internal.cluster_queries.txt diff --git a/pkg/cli/testdata/zip/unavailable b/pkg/cli/testdata/zip/unavailable index 1da3e7274a10..4b47a4dcb796 100644 --- a/pkg/cli/testdata/zip/unavailable +++ b/pkg/cli/testdata/zip/unavailable @@ -10,7 +10,6 @@ requesting data for debug/events... writing: debug/events.json.err.txt ^- resulted in ... requesting data for debug/rangelog... writing: debug/rangelog.json.err.txt ^- resulted in ... -requesting data for debug/liveness... writing: debug/liveness.json requesting data for debug/settings... writing: debug/settings.json requesting data for debug/reports/problemranges... writing: debug/reports/problemranges.json retrieving SQL data for crdb_internal.cluster_queries... writing: debug/crdb_internal.cluster_queries.txt diff --git a/pkg/cli/zip.go b/pkg/cli/zip.go index 5189ae41cde4..6b9848b1e8d5 100644 --- a/pkg/cli/zip.go +++ b/pkg/cli/zip.go @@ -294,6 +294,8 @@ func runDebugZip(cmd *cobra.Command, args []string) (retErr error) { return z.createJSONOrError(r.pathName+".json", data, err) } + // NB: we intentionally omit liveness since it's already pulled manually (we + // act on the output to special case decommissioned nodes). for _, r := range []zipRequest{ { fn: func(ctx context.Context) (interface{}, error) { @@ -307,12 +309,6 @@ func runDebugZip(cmd *cobra.Command, args []string) (retErr error) { }, pathName: rangelogName, }, - { - fn: func(ctx context.Context) (interface{}, error) { - return admin.Liveness(ctx, &serverpb.LivenessRequest{}) - }, - pathName: livenessName, - }, { fn: func(ctx context.Context) (interface{}, error) { return admin.Settings(ctx, &serverpb.SettingsRequest{}) @@ -371,7 +367,7 @@ func runDebugZip(cmd *cobra.Command, args []string) (retErr error) { lresponse, err = admin.Liveness(ctx, &serverpb.LivenessRequest{}) return err }) - if cErr := z.createJSONOrError(base+"/liveness.json", nodes, err); cErr != nil { + if cErr := z.createJSONOrError(livenessName+".json", nodes, err); cErr != nil { return cErr } livenessByNodeID := map[roachpb.NodeID]kvserverpb.NodeLivenessStatus{}