mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-12 17:30:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: allocate extents when expanding an image

Browse Source 
When and RBD image is expanded, the additional extents need to get
allocated when the image was thick-provisioned.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-01-28 14:59:48 +01:00 committed by mergify[bot]
parent 294a0973bd
commit cc96bdaac3
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
internal/rbd/rbd_util.go
View File

@ -228,7 +228,7 @@ func createImage(ctx context.Context, pOpts *rbdVolume, cr *util.Credentials) er
} }
if pOpts.ThickProvision { if pOpts.ThickProvision {
err = pOpts.allocate(ctx) err = pOpts.allocate(0)
if err != nil { if err != nil {
// nolint:errcheck // deleteImage() will log errors in // nolint:errcheck // deleteImage() will log errors in
// case it fails, no need to log them here again // case it fails, no need to log them here again
@ -307,9 +307,7 @@ func (rv *rbdVolume) open() (*librbd.Image, error) {
// allocate uses the stripe-period of the image to fully allocate (thick // allocate uses the stripe-period of the image to fully allocate (thick
// provision) the image. // provision) the image.
func (rv *rbdVolume) allocate(ctx context.Context) error { func (rv *rbdVolume) allocate(offset uint64) error {
util.DebugLog(ctx, "going to allocate %q with %d bytes, this may take time", rv.String(), rv.VolSize)
// We do not want to call discard, we really want to write zeros to get // We do not want to call discard, we really want to write zeros to get
// the allocation. This sets the option for the re-used connection, and // the allocation. This sets the option for the re-used connection, and
// all subsequent images that are opened. That is not a problem, as // all subsequent images that are opened. That is not a problem, as
@ -341,8 +339,7 @@ func (rv *rbdVolume) allocate(ctx context.Context) error {
// the actual size of the image as available in the pool, can be // the actual size of the image as available in the pool, can be
// marginally different from the requested image size // marginally different from the requested image size
s, err := image.WriteSame(0, st.Size, zeroBlock, rados.OpFlagNone) _, err = image.WriteSame(offset, st.Size-offset, zeroBlock, rados.OpFlagNone)
util.DebugLog(ctx, "wrote %d bytes to %q", s, rv.String())
return err return err
} }
@ -1223,13 +1220,42 @@ func (rv *rbdVolume) resize(newSize int64) error {
} }
defer image.Close() defer image.Close()
thick, err := rv.isThickProvisioned()
if err != nil {
return err
}
// offset is used to track from where on the expansion is done, so that
// the extents can be allocated in case the image is thick-provisioned
var offset uint64
if thick {
st, statErr := image.Stat()
if statErr != nil {
return statErr
}
offset = st.Size
}
err = image.Resize(uint64(util.RoundOffVolSize(newSize) * helpers.MiB)) err = image.Resize(uint64(util.RoundOffVolSize(newSize) * helpers.MiB))
if err != nil { if err != nil {
return err return err
} }
if thick {
err = rv.allocate(offset)
if err != nil {
resizeErr := image.Resize(offset)
if resizeErr != nil {
err = fmt.Errorf("failed to shrink image (%v) after failed allocation: %w", resizeErr, err)
}
return err
}
}
// update Volsize of rbdVolume object to newSize. // update Volsize of rbdVolume object to newSize.
rv.VolSize = newSize rv.VolSize = newSize
return nil return nil
} }