mirror of
https://github.com/hanzoai/s3.git
synced 2026-10-30 14:59:09 +00:00
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.
183 lines
7.3 KiB
Go
183 lines
7.3 KiB
Go
package volume_server_grpc_test
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"sort"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/hanzoai/s3/s3/pb"
|
|
|
|
"github.com/hanzoai/s3/s3/pb/volume_server_pb"
|
|
"github.com/hanzoai/s3/s3/storage/erasure_coding"
|
|
"github.com/hanzoai/s3/test/volume_server/framework"
|
|
"github.com/hanzoai/s3/test/volume_server/matrix"
|
|
)
|
|
|
|
// TestVolumeEcShardsInfoReturnsAllShardsAcrossDisks drives the full path
|
|
// behind the ec.encode source-deletion gate. A multi-disk volume server
|
|
// ends up with EC shards split across disks (each registers its own
|
|
// EcVolume entry in DiskLocation.ecVolumes), and the volume server's
|
|
// VolumeEcShardsInfo RPC must walk every DiskLocation rather than
|
|
// reporting whichever disk Store.FindEcVolume picks first.
|
|
//
|
|
// Pre-fix, verifyEcShardsBeforeDelete refused to delete source volumes —
|
|
// the shard-bitmap union across destinations fell short of dataShards +
|
|
// parityShards because each destination only reported shards on one of
|
|
// its disks. With the handler fix, the same VerifyShardsAcrossServers
|
|
// call returns a complete bitmap and the gate opens.
|
|
func TestVolumeEcShardsInfoReturnsAllShardsAcrossDisks(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("skipping integration test in short mode")
|
|
}
|
|
|
|
const (
|
|
dataDirCount = 2
|
|
volumeID = uint32(9558)
|
|
collection = "ec-multi-disk-verify"
|
|
)
|
|
|
|
clusterHarness := framework.StartSingleVolumeClusterWithDataDirs(t, matrix.P1(), dataDirCount)
|
|
dataDirs := clusterHarness.VolumeDataDirs()
|
|
if len(dataDirs) != dataDirCount {
|
|
t.Fatalf("expected %d data dirs, got %d: %v", dataDirCount, len(dataDirs), dataDirs)
|
|
}
|
|
|
|
conn, grpcClient := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress())
|
|
defer conn.Close()
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
|
|
defer cancel()
|
|
|
|
framework.AllocateVolume(t, grpcClient, volumeID, collection)
|
|
|
|
httpClient := framework.NewHTTPClient()
|
|
needles := []struct {
|
|
fid string
|
|
payload []byte
|
|
}{
|
|
{framework.NewFileID(volumeID, 9559, 0xC0FFEE01), bytesOfLen(64, 0xB1)},
|
|
{framework.NewFileID(volumeID, 9560, 0xC0FFEE02), bytesOfLen(8192, 0xB2)},
|
|
{framework.NewFileID(volumeID, 9561, 0xC0FFEE03), bytesOfLen(131072, 0xB3)},
|
|
}
|
|
for _, n := range needles {
|
|
resp := framework.UploadBytes(t, httpClient, clusterHarness.VolumeAdminURL(), n.fid, n.payload)
|
|
_ = framework.ReadAllAndClose(t, resp)
|
|
if resp.StatusCode != http.StatusCreated {
|
|
t.Fatalf("upload %s expected 201, got %d", n.fid, resp.StatusCode)
|
|
}
|
|
}
|
|
|
|
if _, err := grpcClient.VolumeEcShardsGenerate(ctx, &volume_server_pb.VolumeEcShardsGenerateRequest{
|
|
VolumeId: volumeID,
|
|
Collection: collection,
|
|
}); err != nil {
|
|
t.Fatalf("VolumeEcShardsGenerate: %v", err)
|
|
}
|
|
|
|
// Generate places every shard plus the .ecx/.ecj/.vif on the .dat's
|
|
// disk (disk 0). Mount all 14 there first so the next step's restart
|
|
// has a steady starting state.
|
|
allShards := make([]uint32, erasure_coding.TotalShardsCount)
|
|
for i := range allShards {
|
|
allShards[i] = uint32(i)
|
|
}
|
|
if _, err := grpcClient.VolumeEcShardsMount(ctx, &volume_server_pb.VolumeEcShardsMountRequest{
|
|
VolumeId: volumeID,
|
|
Collection: collection,
|
|
ShardIds: allShards,
|
|
}); err != nil {
|
|
t.Fatalf("VolumeEcShardsMount all shards: %v", err)
|
|
}
|
|
|
|
// Drop the .dat so the EC shards are the only data path — mirrors the
|
|
// real ec.encode flow before verifyEcShardsBeforeDelete fires.
|
|
if _, err := grpcClient.VolumeDelete(ctx, &volume_server_pb.VolumeDeleteRequest{
|
|
VolumeId: volumeID,
|
|
}); err != nil {
|
|
t.Fatalf("VolumeDelete (drop .dat): %v", err)
|
|
}
|
|
|
|
// Move half the shards onto disk 1, leaving .ecx on disk 0. After
|
|
// restart, the cross-disk reconcile path attaches each disk's shards
|
|
// against its own EcVolume entry — the exact in-memory shape the bug
|
|
// reporter saw on a multi-disk destination.
|
|
clusterHarness.StopVolumeServer()
|
|
const splitAt = 7
|
|
for shard := 0; shard < splitAt; shard++ {
|
|
movedFile(t, dataDirs[0], dataDirs[1], collection, volumeID, erasure_coding.ToExt(shard))
|
|
}
|
|
if fileExistsIn(dataDirs[1], collection, volumeID, ".ecx") {
|
|
t.Fatalf("setup: .ecx must stay on disk 0 to exercise the multi-disk path")
|
|
}
|
|
|
|
clusterHarness.RestartVolumeServer()
|
|
conn2, grpcClient2 := framework.DialVolumeServer(t, clusterHarness.VolumeGRPCAddress())
|
|
defer conn2.Close()
|
|
|
|
postReconcileLayout := scanShardLayout(t, dataDirs, collection, volumeID)
|
|
if got, want := totalShardsInLayout(postReconcileLayout), erasure_coding.TotalShardsCount; got != want {
|
|
t.Fatalf("post-reconcile: total shards on disk mismatch: got %d, want %d (layout=%v)", got, want, postReconcileLayout)
|
|
}
|
|
if len(postReconcileLayout[0]) == 0 || len(postReconcileLayout[1]) == 0 {
|
|
t.Fatalf("post-reconcile: expected shards on BOTH disks, got per-disk layout %v", postReconcileLayout)
|
|
}
|
|
|
|
// Direct RPC assertion: VolumeEcShardsInfo must report every shard
|
|
// the server holds, not just the ones registered against the first
|
|
// matching DiskLocation.
|
|
infoResp, err := grpcClient2.VolumeEcShardsInfo(ctx, &volume_server_pb.VolumeEcShardsInfoRequest{
|
|
VolumeId: volumeID,
|
|
})
|
|
if err != nil {
|
|
t.Fatalf("VolumeEcShardsInfo: %v", err)
|
|
}
|
|
gotShardIds := make([]int, 0, len(infoResp.GetEcShardInfos()))
|
|
for _, info := range infoResp.GetEcShardInfos() {
|
|
if info.GetVolumeId() != volumeID {
|
|
t.Errorf("EcShardInfo VolumeId=%d, want %d", info.GetVolumeId(), volumeID)
|
|
}
|
|
gotShardIds = append(gotShardIds, int(info.GetShardId()))
|
|
}
|
|
sort.Ints(gotShardIds)
|
|
wantShardIds := make([]int, erasure_coding.TotalShardsCount)
|
|
for i := range wantShardIds {
|
|
wantShardIds[i] = i
|
|
}
|
|
if len(gotShardIds) != len(wantShardIds) {
|
|
t.Fatalf("VolumeEcShardsInfo returned %d shards (ids=%v), want %d (ids=%v) — per-disk layout=%v",
|
|
len(gotShardIds), gotShardIds, len(wantShardIds), wantShardIds, postReconcileLayout)
|
|
}
|
|
for i, sid := range wantShardIds {
|
|
if gotShardIds[i] != sid {
|
|
t.Fatalf("VolumeEcShardsInfo shard ids=%v, want %v (per-disk layout=%v)",
|
|
gotShardIds, wantShardIds, postReconcileLayout)
|
|
}
|
|
}
|
|
|
|
// End-to-end assertion via the same helper the worker uses to gate
|
|
// source-volume deletion (s3/worker/tasks/erasure_coding/ec_task.go
|
|
// verifyEcShardsBeforeDelete). The union across destinations is what
|
|
// RequireRecoverableShardSet measures; with one destination that holds
|
|
// every shard, the union must cover dataShards + parityShards without
|
|
// being reported as degraded.
|
|
dialOption := pb.DialOption{}
|
|
servers := []string{clusterHarness.VolumeServerAddress()}
|
|
union, perServer := erasure_coding.VerifyShardsAcrossServers(ctx, volumeID, servers, dialOption)
|
|
degraded, err := erasure_coding.RequireRecoverableShardSet(
|
|
volumeID, union, erasure_coding.DataShardsCount, erasure_coding.TotalShardsCount)
|
|
if err != nil {
|
|
t.Fatalf("verifyEcShardsBeforeDelete-equivalent gate failed: %v\nper-server inventory: %s\nper-disk layout: %v",
|
|
err, erasure_coding.SummarizeShardInventory(perServer), postReconcileLayout)
|
|
}
|
|
if degraded {
|
|
t.Fatalf("verifyEcShardsBeforeDelete-equivalent gate reported a degraded shard set\nper-server inventory: %s\nper-disk layout: %v",
|
|
erasure_coding.SummarizeShardInventory(perServer), postReconcileLayout)
|
|
}
|
|
if got, want := union.Count(), erasure_coding.TotalShardsCount; got != want {
|
|
t.Fatalf("VerifyShardsAcrossServers union covered %d/%d shards (per-server=%s, layout=%v)",
|
|
got, want, erasure_coding.SummarizeShardInventory(perServer), postReconcileLayout)
|
|
}
|
|
}
|