Browse Source

display bucket quota

pull/2613/head
chrislu 3 years ago
parent
commit
b1063162b6
  1. 1
      other/java/client/src/main/proto/filer.proto
  2. 1
      weed/pb/filer.proto
  3. 1020
      weed/pb/filer_pb/filer.pb.go
  4. 9
      weed/shell/command_s3_bucket_list.go

1
other/java/client/src/main/proto/filer.proto

@ -114,6 +114,7 @@ message Entry {
bytes content = 9; // if not empty, the file content bytes content = 9; // if not empty, the file content
RemoteEntry remote_entry = 10; RemoteEntry remote_entry = 10;
int64 quota = 11; // for bucket only. Positive/Negative means enabled/disabled.
} }
message FullEntry { message FullEntry {

1
weed/pb/filer.proto

@ -114,6 +114,7 @@ message Entry {
bytes content = 9; // if not empty, the file content bytes content = 9; // if not empty, the file content
RemoteEntry remote_entry = 10; RemoteEntry remote_entry = 10;
int64 quota = 11; // for bucket only. Positive/Negative means enabled/disabled.
} }
message FullEntry { message FullEntry {

1020
weed/pb/filer_pb/filer.pb.go
File diff suppressed because it is too large
View File

9
weed/shell/command_s3_bucket_list.go

@ -63,7 +63,14 @@ func (c *commandS3BucketList) Do(args []string, commandEnv *CommandEnv, writer i
collectionSize = collectionInfo.Size collectionSize = collectionInfo.Size
fileCount = collectionInfo.FileCount - collectionInfo.DeleteCount fileCount = collectionInfo.FileCount - collectionInfo.DeleteCount
} }
fmt.Fprintf(writer, " %s\tsize:%d bytes\tfile:%d\treplication: %s\n", entry.Name, collectionSize, fileCount, entry.Attributes.Replication)
fmt.Fprintf(writer, " %s\tsize:%d\tfile:%d", entry.Name, collectionSize, fileCount)
if entry.Quota > 0 {
fmt.Fprintf(writer, "\tquota:%d\tusage:%.2f%%", entry.Quota, float64(collectionSize)*100/float64(entry.Quota))
}
if entry.Attributes.Replication != "" && entry.Attributes.Replication != "000" {
fmt.Fprintf(writer, "\treplication:%s", entry.Attributes.Replication)
}
fmt.Fprintln(writer)
return nil return nil
}, "", false, math.MaxUint32) }, "", false, math.MaxUint32)
if err != nil { if err != nil {

Loading…
Cancel
Save