Skip to content

PWX-24576: Implement clouddrive Expand API in CloudOps #113

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

Merged
nikita-bhatia merged 4 commits into from
Sep 9, 2022
Merged

PWX-24576: Implement clouddrive Expand API in CloudOps #113

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d349fe
PWX-24576: Implement clouddrive Expand API in CloudOps
nikita-bhatia Sep 2, 2022
6cd27bf
PWX-24576 : Fix review comments
nikita-bhatia Sep 5, 2022
176320a
PWX-24576 : Fix review comments
nikita-bhatia Sep 5, 2022
0d5bcba
Merge branch 'master' into PWX-24576
nikita-bhatia Sep 9, 2022
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
40 changes: 40 additions & 0 deletions oracle/oracle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"io/ioutil"
"net/http"
"os"
"strconv"
"strings"
"sync"
"time"
Expand Down Expand Up @@ -787,6 +788,45 @@ func nodePoolContainsNode(s []containerengine.Node, e string) bool {
return false
}


func (o *oracleOps) Expand(volumeID string, newSizeInGiB uint64) (uint64, error) {
Copy link
Copy Markdown
Contributor

@vinayakshnd vinayakshnd Sep 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First check the current size of the disk. If requested newSizeInGiB is less than or equal to current size then return an error.
Take a look at how are we currently doing in AWS: https://github.com/libopenstorage/cloudops/blob/master/aws/aws.go#L937

Copy link
Copy Markdown
Contributor Author

@nikita-bhatia nikita-bhatia Sep 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

logrus.Debug("Expand volume to size ", newSizeInGiB, " GiB")

volume, err := o.storage.GetVolume(context.Background(), core.GetVolumeRequest{VolumeId: &volumeID})
if err != nil {
return 0, err
}

currentsize := uint64(*volume.SizeInGBs)

if (currentsize > newSizeInGiB) || (currentsize == newSizeInGiB) {
return currentsize, errors.New("Can not change Volume size from " + strconv.Itoa(int(currentsize)) + " GiB to " + strconv.Itoa(int(newSizeInGiB)) + " GiB")
}

req := core.UpdateVolumeRequest{
VolumeId: &volumeID,
UpdateVolumeDetails: core.UpdateVolumeDetails{
SizeInGBs: common.Int64(int64(newSizeInGiB)),
},
}

updateVolResp, err := o.storage.UpdateVolume(context.Background(), req)
if err != nil {
return 0, err
}

oracleVol, err := o.waitVolumeStatus(*updateVolResp.Id, core.VolumeLifecycleStateAvailable)
if err != nil {
return 0, err
}
updatedVol, ok := oracleVol.(*core.Volume)
if !ok {
return 0, errors.New("Marshelling failed for Oracle volume")
}

return uint64(*updatedVol.SizeInGBs), nil
}

func (o *oracleOps) SetClusterVersion(version string, timeout time.Duration) error {
logrus.Println("Setting Cluster version to", version)
req := containerengine.UpdateClusterRequest{
Expand Down