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.
86 lines
2.7 KiB
Go
86 lines
2.7 KiB
Go
package erasure_coding_test
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/hanzoai/s3/s3/pb"
|
|
|
|
"github.com/hanzoai/s3/s3/pb/plugin_pb"
|
|
pluginworker "github.com/hanzoai/s3/s3/plugin/worker"
|
|
ecstorage "github.com/hanzoai/s3/s3/storage/erasure_coding"
|
|
"github.com/hanzoai/s3/s3/worker/tasks/erasure_coding"
|
|
pluginworkers "github.com/hanzoai/s3/test/plugin_workers"
|
|
)
|
|
|
|
func TestErasureCodingExecutionEncodesShards(t *testing.T) {
|
|
volumeID := uint32(123)
|
|
datSize := 1 * 1024 * 1024
|
|
|
|
dialOption := pb.DialOption{}
|
|
handler := erasure_coding.NewErasureCodingHandler(dialOption, t.TempDir())
|
|
harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
|
|
WorkerOptions: pluginworker.WorkerOptions{
|
|
GrpcDialOption: dialOption,
|
|
},
|
|
Handlers: []pluginworker.JobHandler{handler},
|
|
})
|
|
harness.WaitForJobType("erasure_coding")
|
|
|
|
sourceServer := pluginworkers.NewVolumeServer(t, "")
|
|
pluginworkers.WriteTestVolumeFiles(t, sourceServer.BaseDir(), volumeID, datSize)
|
|
|
|
targetServers := make([]*pluginworkers.VolumeServer, 0, ecstorage.TotalShardsCount)
|
|
targetAddresses := make([]string, 0, ecstorage.TotalShardsCount)
|
|
for i := 0; i < ecstorage.TotalShardsCount; i++ {
|
|
target := pluginworkers.NewVolumeServer(t, "")
|
|
targetServers = append(targetServers, target)
|
|
targetAddresses = append(targetAddresses, target.Address())
|
|
}
|
|
|
|
job := &plugin_pb.JobSpec{
|
|
JobId: fmt.Sprintf("ec-job-%d", volumeID),
|
|
JobType: "erasure_coding",
|
|
Parameters: map[string]*plugin_pb.ConfigValue{
|
|
"volume_id": {
|
|
Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: int64(volumeID)},
|
|
},
|
|
"collection": {
|
|
Kind: &plugin_pb.ConfigValue_StringValue{StringValue: "ec-test"},
|
|
},
|
|
"source_server": {
|
|
Kind: &plugin_pb.ConfigValue_StringValue{StringValue: sourceServer.Address()},
|
|
},
|
|
"target_servers": {
|
|
Kind: &plugin_pb.ConfigValue_StringList{StringList: &plugin_pb.StringList{Values: targetAddresses}},
|
|
},
|
|
},
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
|
defer cancel()
|
|
|
|
result, err := harness.Plugin().ExecuteJob(ctx, job, nil, 1)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, result)
|
|
require.True(t, result.Success)
|
|
|
|
require.GreaterOrEqual(t, sourceServer.MarkReadonlyCount(), 1)
|
|
require.GreaterOrEqual(t, len(sourceServer.DeleteRequests()), 1)
|
|
|
|
for shardID := 0; shardID < ecstorage.TotalShardsCount; shardID++ {
|
|
targetIndex := shardID % len(targetServers)
|
|
target := targetServers[targetIndex]
|
|
expected := filepath.Join(target.BaseDir(), fmt.Sprintf("%d.ec%02d", volumeID, shardID))
|
|
info, err := os.Stat(expected)
|
|
require.NoErrorf(t, err, "missing shard file %s", expected)
|
|
require.Greater(t, info.Size(), int64(0))
|
|
}
|
|
}
|