go fmt
This commit is contained in:
@@ -33,7 +33,7 @@ type DualVolumeCluster struct {
|
|||||||
volumeGrpcPort1 int
|
volumeGrpcPort1 int
|
||||||
volumePubPort1 int
|
volumePubPort1 int
|
||||||
|
|
||||||
masterCmd *exec.Cmd
|
masterCmd *exec.Cmd
|
||||||
volumeCmd0 *exec.Cmd
|
volumeCmd0 *exec.Cmd
|
||||||
volumeCmd1 *exec.Cmd
|
volumeCmd1 *exec.Cmd
|
||||||
|
|
||||||
@@ -79,21 +79,21 @@ func StartDualVolumeCluster(t testing.TB, profile matrix.Profile) *DualVolumeClu
|
|||||||
}
|
}
|
||||||
|
|
||||||
c := &DualVolumeCluster{
|
c := &DualVolumeCluster{
|
||||||
testingTB: t,
|
testingTB: t,
|
||||||
profile: profile,
|
profile: profile,
|
||||||
weedBinary: weedBinary,
|
weedBinary: weedBinary,
|
||||||
baseDir: baseDir,
|
baseDir: baseDir,
|
||||||
configDir: configDir,
|
configDir: configDir,
|
||||||
logsDir: logsDir,
|
logsDir: logsDir,
|
||||||
keepLogs: keepLogs,
|
keepLogs: keepLogs,
|
||||||
masterPort: masterPort,
|
masterPort: masterPort,
|
||||||
masterGrpcPort: masterGrpcPort,
|
masterGrpcPort: masterGrpcPort,
|
||||||
volumePort0: ports[0],
|
volumePort0: ports[0],
|
||||||
volumeGrpcPort0: ports[1],
|
volumeGrpcPort0: ports[1],
|
||||||
volumePubPort0: ports[0],
|
volumePubPort0: ports[0],
|
||||||
volumePort1: ports[2],
|
volumePort1: ports[2],
|
||||||
volumeGrpcPort1: ports[3],
|
volumeGrpcPort1: ports[3],
|
||||||
volumePubPort1: ports[2],
|
volumePubPort1: ports[2],
|
||||||
}
|
}
|
||||||
if profile.SplitPublicPort {
|
if profile.SplitPublicPort {
|
||||||
c.volumePubPort0 = ports[4]
|
c.volumePubPort0 = ports[4]
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ type ListPolicyVersionsResponse struct {
|
|||||||
// GetPolicyVersionResponse is the response for GetPolicyVersion action.
|
// GetPolicyVersionResponse is the response for GetPolicyVersion action.
|
||||||
type GetPolicyVersionResponse struct {
|
type GetPolicyVersionResponse struct {
|
||||||
CommonResponse
|
CommonResponse
|
||||||
XMLName xml.Name `xml:"https://iam.amazonaws.com/doc/2010-05-08/ GetPolicyVersionResponse"`
|
XMLName xml.Name `xml:"https://iam.amazonaws.com/doc/2010-05-08/ GetPolicyVersionResponse"`
|
||||||
GetPolicyVersionResult struct {
|
GetPolicyVersionResult struct {
|
||||||
PolicyVersion iam.PolicyVersion `xml:"PolicyVersion"`
|
PolicyVersion iam.PolicyVersion `xml:"PolicyVersion"`
|
||||||
} `xml:"GetPolicyVersionResult"`
|
} `xml:"GetPolicyVersionResult"`
|
||||||
|
|||||||
@@ -90,18 +90,18 @@ func newTestS3ApiServerWithMemoryIAM(t *testing.T, identities []*iam_pb.Identity
|
|||||||
|
|
||||||
// Create a test IAM instance
|
// Create a test IAM instance
|
||||||
iam := &IdentityAccessManagement{
|
iam := &IdentityAccessManagement{
|
||||||
m: sync.RWMutex{},
|
m: sync.RWMutex{},
|
||||||
nameToIdentity: make(map[string]*Identity),
|
nameToIdentity: make(map[string]*Identity),
|
||||||
accessKeyIdent: make(map[string]*Identity),
|
accessKeyIdent: make(map[string]*Identity),
|
||||||
identities: []*Identity{},
|
identities: []*Identity{},
|
||||||
policies: make(map[string]*iam_pb.Policy),
|
policies: make(map[string]*iam_pb.Policy),
|
||||||
accounts: make(map[string]*Account),
|
accounts: make(map[string]*Account),
|
||||||
emailAccount: make(map[string]*Account),
|
emailAccount: make(map[string]*Account),
|
||||||
hashes: make(map[string]*sync.Pool),
|
hashes: make(map[string]*sync.Pool),
|
||||||
hashCounters: make(map[string]*int32),
|
hashCounters: make(map[string]*int32),
|
||||||
isAuthEnabled: false,
|
isAuthEnabled: false,
|
||||||
stopChan: make(chan struct{}),
|
stopChan: make(chan struct{}),
|
||||||
useStaticConfig: false,
|
useStaticConfig: false,
|
||||||
credentialManager: cm,
|
credentialManager: cm,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ func (s3a *S3ApiServer) readTableLocationMappingFromDirectory(bucket string) (st
|
|||||||
conflict := false
|
conflict := false
|
||||||
|
|
||||||
err := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
|
err := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
|
||||||
stream, err := client.ListEntries(context.Background(), &filer_pb.ListEntriesRequest{
|
stream, err := client.ListEntries(context.Background(), &filer_pb.ListEntriesRequest{
|
||||||
Directory: mappingDir,
|
Directory: mappingDir,
|
||||||
Limit: 4294967295, // math.MaxUint32
|
Limit: 4294967295, // math.MaxUint32
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ const (
|
|||||||
ExtETagKey = "Seaweed-X-Amz-ETag"
|
ExtETagKey = "Seaweed-X-Amz-ETag"
|
||||||
ExtLatestVersionIdKey = "Seaweed-X-Amz-Latest-Version-Id"
|
ExtLatestVersionIdKey = "Seaweed-X-Amz-Latest-Version-Id"
|
||||||
ExtLatestVersionFileNameKey = "Seaweed-X-Amz-Latest-Version-File-Name"
|
ExtLatestVersionFileNameKey = "Seaweed-X-Amz-Latest-Version-File-Name"
|
||||||
ExtAllowEmptyFolders = "Seaweed-X-Amz-Allow-Empty-Folders"
|
ExtAllowEmptyFolders = "Seaweed-X-Amz-Allow-Empty-Folders"
|
||||||
// Cached list metadata in .versions directory for single-scan efficiency
|
// Cached list metadata in .versions directory for single-scan efficiency
|
||||||
ExtLatestVersionSizeKey = "Seaweed-X-Amz-Latest-Version-Size"
|
ExtLatestVersionSizeKey = "Seaweed-X-Amz-Latest-Version-Size"
|
||||||
ExtLatestVersionETagKey = "Seaweed-X-Amz-Latest-Version-ETag"
|
ExtLatestVersionETagKey = "Seaweed-X-Amz-Latest-Version-ETag"
|
||||||
|
|||||||
Reference in New Issue
Block a user