fix(admin): carry filer addresses as ServerAddress in plugin cluster context (#9600)

The plugin cluster context forwarded filers as gRPC-only addresses
(host:grpcPort). The admin-script worker stored that in
ShellOptions.FilerAddress, whose shell commands re-derive the gRPC port
via ToGrpcAddress() and re-add the +10000 offset, dialing a non-existent
host:28888.

Carry filers in pb.ServerAddress form (host:httpPort.grpcPort) and let
each consumer convert when it dials: the admin shell uses it verbatim,
while the s3_lifecycle and iceberg workers collapse it to a gRPC address.
Rename the proto field filer_grpc_addresses -> filer_addresses so the
name matches the content.

weed/worker/tasks/iceberg/exec_test.go

@@ -246,7 +246,7 @@ func startFakeFilerWithAddress(t *testing.T) (*fakeFilerServer, filer_pb.Seaweed
 	}
 
 	// Return the gRPC address in dialable form (host:grpcPort) since
-	// dialFiler now dials FilerGrpcAddresses verbatim.
+	// dialFiler dials the resolved filer_grpc_address verbatim.
 	return fakeServer, client, listener.Addr().String()
 }
 

weed/worker/tasks/iceberg/handler.go

@@ -376,10 +376,13 @@ func (h *Handler) Detect(ctx context.Context, request *plugin_pb.RunDetectionReq
 
 	// Detection interval is managed by the scheduler via AdminRuntimeDefaults.DetectionIntervalMinutes.
 
-	// Get filer gRPC addresses from cluster context
+	// ClusterContext.FilerAddresses are pb.ServerAddress strings
+	// (host:httpPort.grpcPort); collapse each to a dialable gRPC address.
 	filerGrpcAddresses := make([]string, 0)
 	if request.ClusterContext != nil {
-		filerGrpcAddresses = append(filerGrpcAddresses, request.ClusterContext.FilerGrpcAddresses...)
+		for _, filer := range request.ClusterContext.FilerAddresses {
+			filerGrpcAddresses = append(filerGrpcAddresses, pb.ServerAddress(filer).ToGrpcAddress())
+		}
 	}
 	if len(filerGrpcAddresses) == 0 {
 		_ = sender.SendActivity(pluginworker.BuildDetectorActivity("skipped", "no filer addresses in cluster context", nil))
@@ -640,12 +643,10 @@ func (h *Handler) sendEmptyDetection(sender pluginworker.DetectionSender) error
 	})
 }
 
-// dialFiler connects to a filer at the given gRPC address. The address is
-// expected to be already dialable (host:grpcPort) as supplied via
-// ClusterContext.FilerGrpcAddresses or a job proposal parameter; we don't
-// run it through pb.ServerAddress.ToGrpcAddress because that helper's
-// fallback adds +10000 to any single-port address, turning a real gRPC
-// port like 18888 into a non-existent 28888.
+// dialFiler connects to a filer at the given gRPC address. The address must
+// already be a dialable host:grpcPort: Detect resolves it from
+// ClusterContext.FilerAddresses via ToGrpcAddress and stores that resolved form
+// in the job proposal parameter, so dialFiler dials it verbatim.
 func (h *Handler) dialFiler(ctx context.Context, grpcAddress string) (*grpc.ClientConn, error) {
 	opCtx, opCancel := context.WithTimeout(ctx, filerConnectTimeout)
 	defer opCancel()

weed/worker/tasks/s3_lifecycle/handler.go

@@ -170,19 +170,22 @@ func (h *Handler) Detect(ctx context.Context, request *plugin_pb.RunDetectionReq
 	}
 	filerAddresses := []string{}
 	if request.ClusterContext != nil {
-		filerAddresses = append(filerAddresses, request.ClusterContext.FilerGrpcAddresses...)
+		filerAddresses = append(filerAddresses, request.ClusterContext.FilerAddresses...)
 	}
 	if len(filerAddresses) == 0 {
 		_ = sender.SendActivity(pluginworker.BuildDetectorActivity("skipped", "no filer addresses in cluster context", nil))
 		return sender.SendComplete(&plugin_pb.DetectionComplete{JobType: jobType, Success: true})
 	}
 
+	// FilerAddresses are pb.ServerAddress strings (host:httpPort.grpcPort);
+	// Execute dials filer_grpc_address verbatim, so resolve it to a gRPC address.
+	filerGrpcAddress := pb.ServerAddress(filerAddresses[0]).ToGrpcAddress()
 	proposal := &plugin_pb.JobProposal{
 		JobType:    jobType,
 		ProposalId: fmt.Sprintf("s3-lifecycle-%d", time.Now().UnixNano()),
 		Priority:   plugin_pb.JobPriority_JOB_PRIORITY_NORMAL,
 		Parameters: map[string]*plugin_pb.ConfigValue{
-			"filer_grpc_address": {Kind: &plugin_pb.ConfigValue_StringValue{StringValue: filerAddresses[0]}},
+			"filer_grpc_address": {Kind: &plugin_pb.ConfigValue_StringValue{StringValue: filerGrpcAddress}},
 		},
 	}
 	if err := sender.SendProposals(&plugin_pb.DetectionProposals{

weed/worker/tasks/s3_lifecycle/handler_test.go

@@ -175,7 +175,7 @@ func TestDetect_NoFilerAddressesCompletesWithSkipActivity(t *testing.T) {
 		JobType: jobType,
 		ClusterContext: &plugin_pb.ClusterContext{
 			S3GrpcAddresses: []string{"s3a:8333"},
-			// no FilerGrpcAddresses
+			// no FilerAddresses
 		},
 	}, r)
 	require.NoError(t, err)
@@ -196,8 +196,10 @@ func TestDetect_HappyPathProposesOneJobWithFirstFilerAddress(t *testing.T) {
 	err := h.Detect(context.Background(), &plugin_pb.RunDetectionRequest{
 		JobType: jobType,
 		ClusterContext: &plugin_pb.ClusterContext{
-			S3GrpcAddresses:    []string{"s3a:8333"},
-			FilerGrpcAddresses: []string{"filer-a:18888", "filer-b:18888"},
+			S3GrpcAddresses: []string{"s3a:8333"},
+			// pb.ServerAddress dual-port form; the gRPC port is pinned off the
+			// +10000 convention so a raw-forwarding regression resurfaces here.
+			FilerAddresses: []string{"filer-a:8888.18890", "filer-b:8888.18890"},
 		},
 	}, r)
 	require.NoError(t, err)
@@ -210,7 +212,7 @@ func TestDetect_HappyPathProposesOneJobWithFirstFilerAddress(t *testing.T) {
 	assert.NotEmpty(t, prop.ProposalId, "proposal id must be unique-per-run")
 	require.Contains(t, prop.Parameters, "filer_grpc_address")
 	val := prop.Parameters["filer_grpc_address"].GetStringValue()
-	assert.Equal(t, "filer-a:18888", val, "first reachable filer is dialed")
+	assert.Equal(t, "filer-a:18890", val, "first filer resolved to its gRPC port, not host:28890")
 
 	require.Len(t, r.completes, 1)
 	assert.True(t, r.completes[0].Success)
@@ -224,8 +226,8 @@ func TestDetect_EmptyJobTypeAccepted(t *testing.T) {
 	r := &recordingSender{}
 	err := h.Detect(context.Background(), &plugin_pb.RunDetectionRequest{
 		ClusterContext: &plugin_pb.ClusterContext{
-			S3GrpcAddresses:    []string{"s3a:8333"},
-			FilerGrpcAddresses: []string{"f:18888"},
+			S3GrpcAddresses: []string{"s3a:8333"},
+			FilerAddresses:  []string{"f:8888.18890"},
 		},
 	}, r)
 	require.NoError(t, err)
@@ -241,8 +243,8 @@ func TestDetect_PropagatesProposalsSendError(t *testing.T) {
 	err := h.Detect(context.Background(), &plugin_pb.RunDetectionRequest{
 		JobType: jobType,
 		ClusterContext: &plugin_pb.ClusterContext{
-			S3GrpcAddresses:    []string{"s3a:8333"},
-			FilerGrpcAddresses: []string{"f:18888"},
+			S3GrpcAddresses: []string{"s3a:8333"},
+			FilerAddresses:  []string{"f:8888.18890"},
 		},
 	}, r)
 	assert.ErrorIs(t, err, want)
@@ -261,8 +263,8 @@ func TestDetect_PropagatesCompleteSendError(t *testing.T) {
 	err := h.Detect(context.Background(), &plugin_pb.RunDetectionRequest{
 		JobType: jobType,
 		ClusterContext: &plugin_pb.ClusterContext{
-			S3GrpcAddresses:    []string{"s3a:8333"},
-			FilerGrpcAddresses: []string{"f:18888"},
+			S3GrpcAddresses: []string{"s3a:8333"},
+			FilerAddresses:  []string{"f:8888.18890"},
 		},
 	}, r)
 	assert.ErrorIs(t, err, want)