Browse Source
fix chunk.ModifiedTsNs (#4264)
* fix
* fix mtime s > ns
---------
Co-authored-by: zemul <zhouzemiao@ihuman.com>
pull/4267/head
zemul
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with
52 additions and
50 deletions
-
weed/s3api/s3_constants/acp_grantee_group.go
-
weed/server/filer_grpc_server_remote.go
-
weed/shell/command_volume_fsck.go
-
weed/topology/topology.go
|
|
@ -1,6 +1,6 @@ |
|
|
|
package s3_constants |
|
|
|
|
|
|
|
//Amazon S3 predefined groups
|
|
|
|
// Amazon S3 predefined groups
|
|
|
|
var ( |
|
|
|
GranteeGroupAllUsers = "http://acs.amazonaws.com/groups/global/AllUsers" |
|
|
|
GranteeGroupAuthenticatedUsers = "http://acs.amazonaws.com/groups/global/AuthenticatedUsers" |
|
|
|
|
|
@ -154,10 +154,11 @@ func (fs *FilerServer) CacheRemoteObjectToLocalCluster(ctx context.Context, req |
|
|
|
} |
|
|
|
|
|
|
|
chunks = append(chunks, &filer_pb.FileChunk{ |
|
|
|
|
|
|
|
FileId: assignResult.Fid, |
|
|
|
Offset: localOffset, |
|
|
|
Size: uint64(size), |
|
|
|
ModifiedTsNs: time.Now().Unix(), |
|
|
|
ModifiedTsNs: time.Now().UnixNano(), |
|
|
|
ETag: etag, |
|
|
|
Fid: &filer_pb.FileId{ |
|
|
|
VolumeId: uint32(fileId.VolumeId), |
|
|
|
|
|
@ -163,6 +163,7 @@ func (c *commandVolumeFsck) Do(args []string, commandEnv *CommandEnv, writer io. |
|
|
|
|
|
|
|
if *c.findMissingChunksInFiler { |
|
|
|
// collect all filer file ids and paths
|
|
|
|
|
|
|
|
if err = c.collectFilerFileIdAndPaths(dataNodeVolumeIdToVInfo, *purgeAbsent, collectCutoffFromAtNs); err != nil { |
|
|
|
return fmt.Errorf("collectFilerFileIdAndPaths: %v", err) |
|
|
|
} |
|
|
|
|
|
@ -35,7 +35,7 @@ type Topology struct { |
|
|
|
|
|
|
|
volumeSizeLimit uint64 |
|
|
|
replicationAsMin bool |
|
|
|
isDisableVacuum bool |
|
|
|
isDisableVacuum bool |
|
|
|
|
|
|
|
Sequence sequence.Sequencer |
|
|
|
|
|
|
|