mirror of
https://github.com/hanzoai/s3.git
synced 2026-10-30 14:59:09 +00:00
zeekay
e1e0356e75
filer, master, iam, plugin and worker no longer use google.golang.org/grpc on
the client path.
- gRPC-free client interfaces: the generated *_grpc.pb.go client interfaces drop
"opts ...grpc.CallOption" (no caller ever passed one) and their streaming
methods return the shared seam types in s3/pb/rpc (ServerStream[T] /
BidiStream[Req,Resp]) instead of grpc.ServerStreamingClient/BidiStreamingClient.
The gRPC server scaffolding (Unimplemented*Server, Register*Server, ServiceDesc,
handler trampolines) is deleted; servers serve over the ZAP wire Dispatch.
- The ZAP adapters (filerzap/masterzap/...) implement the gRPC-free interfaces;
grpc.DialOption becomes pb.DialOption (the dial is the ZAP transport).
- Unary calls honor context deadlines: the wire client threads ctx to
transport.Conn.CallContext (v1.8.1), so a call to an unresponsive peer aborts
on the caller's deadline instead of blocking forever.
- Error semantics: the filer tags each failure with its code name ("NotFound: …",
"Internal: …") in the message, which crosses the ZAP wire and is classified by
mount/error_classifier.go — replacing grpc status/codes.
- master ZAP listener port: grpcPort+10000 could exceed 65535; made overflow-safe.
- test doubles updated to the gRPC-free interfaces (0 tests skipped).
- dead cmd/s3-db and cmd/s3-sql (postgres-wire / SQL-engine entry points whose
backends were already ripped) deleted; finished the backend-rip import cleanup.
go build ./... green; go test ./s3/... green (heavy stream benches run under
their existing -short gates).
Still on gRPC (next wave): volume_server + mq (reverted — servers/adapters not
ready), the remaining ~23 plumbing files, and the go.mod dependency itself.
107 lines
2.9 KiB
Go
107 lines
2.9 KiB
Go
package vacuum_test
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
"github.com/hanzoai/s3/s3/pb"
|
|
|
|
"github.com/hanzoai/s3/s3/pb/master_pb"
|
|
"github.com/hanzoai/s3/s3/pb/plugin_pb"
|
|
"github.com/hanzoai/s3/s3/pb/worker_pb"
|
|
pluginworker "github.com/hanzoai/s3/s3/plugin/worker"
|
|
"github.com/hanzoai/s3/s3/worker/tasks/vacuum"
|
|
pluginworkers "github.com/hanzoai/s3/test/plugin_workers"
|
|
)
|
|
|
|
func TestVacuumDetectionIntegration(t *testing.T) {
|
|
volumeID := uint32(101)
|
|
source := pluginworkers.NewVolumeServer(t, "")
|
|
|
|
response := buildVacuumVolumeListResponse(t, source.Address(), volumeID, 0.6)
|
|
master := pluginworkers.NewMasterServer(t, response)
|
|
|
|
dialOption := pb.DialOption{}
|
|
handler := vacuum.NewVacuumHandler(dialOption, 1)
|
|
harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
|
|
WorkerOptions: pluginworker.WorkerOptions{
|
|
GrpcDialOption: dialOption,
|
|
},
|
|
Handlers: []pluginworker.JobHandler{handler},
|
|
})
|
|
harness.WaitForJobType("vacuum")
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
defer cancel()
|
|
|
|
proposals, err := harness.Plugin().RunDetection(ctx, "vacuum", &plugin_pb.ClusterContext{
|
|
MasterGrpcAddresses: []string{master.Address()},
|
|
}, 10)
|
|
require.NoError(t, err)
|
|
require.NotEmpty(t, proposals)
|
|
|
|
proposal := proposals[0]
|
|
require.Equal(t, "vacuum", proposal.JobType)
|
|
paramsValue := proposal.Parameters["task_params_pb"]
|
|
require.NotNil(t, paramsValue)
|
|
|
|
params := &worker_pb.TaskParams{}
|
|
require.NoError(t, proto.Unmarshal(paramsValue.GetBytesValue(), params))
|
|
require.NotEmpty(t, params.Sources)
|
|
require.NotNil(t, params.GetVacuumParams())
|
|
}
|
|
|
|
func buildVacuumVolumeListResponse(t *testing.T, serverAddress string, volumeID uint32, garbageRatio float64) *master_pb.VolumeListResponse {
|
|
t.Helper()
|
|
|
|
volumeSizeLimitMB := uint64(100)
|
|
volumeSize := uint64(90) * 1024 * 1024
|
|
deletedBytes := uint64(float64(volumeSize) * garbageRatio)
|
|
volumeModifiedAt := time.Now().Add(-48 * time.Hour).Unix()
|
|
|
|
diskInfo := &master_pb.DiskInfo{
|
|
DiskId: 0,
|
|
MaxVolumeCount: 100,
|
|
VolumeCount: 1,
|
|
VolumeInfos: []*master_pb.VolumeInformationMessage{
|
|
{
|
|
Id: volumeID,
|
|
Collection: "vac-test",
|
|
DiskId: 0,
|
|
Size: volumeSize,
|
|
DeletedByteCount: deletedBytes,
|
|
ModifiedAtSecond: volumeModifiedAt,
|
|
ReplicaPlacement: 1,
|
|
ReadOnly: false,
|
|
},
|
|
},
|
|
}
|
|
|
|
node := &master_pb.DataNodeInfo{
|
|
Id: serverAddress,
|
|
Address: serverAddress,
|
|
DiskInfos: map[string]*master_pb.DiskInfo{"hdd": diskInfo},
|
|
}
|
|
|
|
return &master_pb.VolumeListResponse{
|
|
VolumeSizeLimitMb: volumeSizeLimitMB,
|
|
TopologyInfo: &master_pb.TopologyInfo{
|
|
DataCenterInfos: []*master_pb.DataCenterInfo{
|
|
{
|
|
Id: "dc-1",
|
|
RackInfos: []*master_pb.RackInfo{
|
|
{
|
|
Id: "rack-1",
|
|
DataNodeInfos: []*master_pb.DataNodeInfo{node},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|