Skip to content

modify restore command #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yangzong18 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

modify restore command #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions lib/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,17 @@ func (rc *RestoreCommand) ossRestoreObject(bucket *oss.Bucket, object, versionid
}
options = append(options, rc.commonOptions...)

err := rc.ossRestoreObjectRetry(bucket, object, options...)
header, err := rc.command.ossGetObjectStatRetry(bucket, object, options...)
if err != nil {
return err
}
if header.Get("X-Oss-Storage-Class") == StorageIA || header.Get("X-Oss-Storage-Class") == StorageStandard {
rc.updateSkip(1)
LogInfo("restore obj skip: %s\n", object)
return nil
}

err = rc.ossRestoreObjectRetry(bucket, object, options...)
if batchOperate && rc.reOption.snapshotPath != "" {
if err != nil {
_ = rc.updateSnapshot(err, spath, nowt)
Expand Down Expand Up @@ -526,7 +536,19 @@ func (rc *RestoreCommand) restoreProducer(objectFile string, chObjects chan<- st

func (rc *RestoreCommand) restoreConsumer(bucket *oss.Bucket, cloudURL CloudURL, chObjects <-chan string, chError chan<- error) {
for object := range chObjects {
err := rc.restoreObjectWithReport(bucket, object)
header, err := rc.command.ossGetObjectStatRetry(bucket, object)
if err != nil {
chError <- err
if !rc.reOption.ctnu {
return
}
continue
}
if header.Get("X-Oss-Storage-Class") == StorageIA || header.Get("X-Oss-Storage-Class") == StorageStandard {
rc.updateSkip(1)
LogInfo("restore obj skip: %s\n", object)
}
err = rc.restoreObjectWithReport(bucket, object)
if err != nil {
chError <- err
if !rc.reOption.ctnu {
Expand Down
82 changes: 82 additions & 0 deletions lib/restore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,3 +1289,85 @@ func (s *OssutilCommandSuite) TestRestoreProducer(c *C) {

os.Remove(emptyContentFileName)
}

//TestOssRestoreObject test ossRestoreObject
func (s *OssutilCommandSuite) TestOssRestoreObject(c *C) {
bucketName := bucketNamePrefix + randLowStr(10)
s.putBucketWithStorageClass(bucketName, StorageColdArchive, c)

// put object to archive bucket
objectName := "ossutil_test_object" + randStr(5)
testFileName := "ossutil_test_file" + randStr(5)

data := randStr(20)
s.createFile(testFileName, data, c)

client, err := oss.New(endpoint, accessKeyID, accessKeySecret)
c.Assert(err, IsNil)

bucket, err := client.Bucket(bucketName)
c.Assert(err, IsNil)

bucket.PutObjectFromFile(objectName, testFileName, oss.ObjectStorageClass(oss.StorageIA))

restoreCommand.ossRestoreObject(bucket, objectName, "", false)

stat := s.getStat(bucketName, objectName, c)
c.Assert(stat["X-Oss-Storage-Class"], Equals, string(oss.StorageIA))
testLogger.Println(stat)
objectName1 := "ossutil_Standard_object" + randStr(5)

bucket.PutObjectFromFile(objectName1, testFileName, oss.ObjectStorageClass(oss.StorageStandard))
stat1 := s.getStat(bucketName, objectName1, c)
testLogger.Println(stat1)
c.Assert(stat1["X-Oss-Storage-Class"], Equals, string(oss.StorageStandard))
os.Remove(testFileName)
}

//TestOssRestoreObjects test ossRestoreObjects
func (s *OssutilCommandSuite) TestOssRestoreObjects(c *C) {
bucketName := bucketNamePrefix + randLowStr(10)
s.putBucketWithStorageClass(bucketName, StorageColdArchive, c)

// put object to archive bucket
objectAi := "ossutil_IA_object" + randStr(5)
objectStandard := "ossutil_Standard_object" + randStr(5)
objectArchive := "ossutil_Archive_file" + randStr(5)
objectColdArchive := "ossutil_ColdArchive_file" + randStr(5)

testFileName := "ossutil_test_file" + randStr(5)

data := randStr(20)
s.createFile(testFileName, data, c)
client, err := oss.New(endpoint, accessKeyID, accessKeySecret)
c.Assert(err, IsNil)
bucket, err := client.Bucket(bucketName)
c.Assert(err, IsNil)

bucket.PutObjectFromFile(objectAi, testFileName, oss.ObjectStorageClass(oss.StorageIA))
bucket.PutObjectFromFile(objectStandard, testFileName, oss.ObjectStorageClass(oss.StorageStandard))
bucket.PutObjectFromFile(objectArchive, testFileName, oss.ObjectStorageClass(oss.StorageArchive))
bucket.PutObjectFromFile(objectColdArchive, testFileName, oss.ObjectStorageClass(oss.StorageColdArchive))

err = s.initRestoreObject([]string{CloudURLToString(bucketName, "")}, "-rf", DefaultOutputDir)
c.Assert(err, IsNil)
err = restoreCommand.RunCommand()
c.Assert(err, IsNil)

stat := s.getStat(bucketName, objectAi, c)
c.Assert(stat["X-Oss-Storage-Class"], Equals, string(oss.StorageIA))
testLogger.Println(stat)

stat1 := s.getStat(bucketName, objectStandard, c)
c.Assert(stat1["X-Oss-Storage-Class"], Equals, string(oss.StorageStandard))
testLogger.Println(stat1)

stat2 := s.getStat(bucketName, objectArchive, c)
c.Assert(stat2["X-Oss-Storage-Class"], Equals, string(oss.StorageArchive))
c.Assert(stat2["X-Oss-Restore"], Equals, "ongoing-request=\"true\"")
stat3 := s.getStat(bucketName, objectColdArchive, c)
c.Assert(stat3["X-Oss-Storage-Class"], Equals, string(oss.StorageColdArchive))
c.Assert(stat3["X-Oss-Restore"], Equals, "ongoing-request=\"true\"")

os.Remove(testFileName)
}