Skip to content

Commit cdcb8cd

Browse files
committed
Correct MetadataType in the response
Signed-off-by: Prasad Ghangal <[email protected]>
1 parent 9144687 commit cdcb8cd

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

pkg/hostpath/snapshotmetadataserver.go

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (hp *hostPath) GetMetadataAllocated(req *csi.GetMetadataAllocatedRequest, s
8686
if errors.Is(cbErr, io.EOF) {
8787
klog.V(4).Info("reached EOF while getting allocated block metadata, returning")
8888
// send allocated blocks found till EOF
89-
if err := sendGetMetadataAllocatedResponse(stream, vol.VolSize, cb); err != nil {
89+
if err := sendGetMetadataAllocatedResponse(stream, vol.VolSize, hp.config.SnapshotMetadataBlockType, cb); err != nil {
9090
return err
9191
}
9292
return nil
@@ -95,7 +95,7 @@ func (hp *hostPath) GetMetadataAllocated(req *csi.GetMetadataAllocatedRequest, s
9595
return status.Error(codes.Internal, "failed to get allocated block metadata")
9696
}
9797
// stream response to client
98-
if err := sendGetMetadataAllocatedResponse(stream, vol.VolSize, cb); err != nil {
98+
if err := sendGetMetadataAllocatedResponse(stream, vol.VolSize, hp.config.SnapshotMetadataBlockType, cb); err != nil {
9999
return err
100100
}
101101
}
@@ -173,7 +173,7 @@ func (hp *hostPath) GetMetadataDelta(req *csi.GetMetadataDeltaRequest, stream cs
173173
if errors.Is(cbErr, io.EOF) {
174174
klog.V(4).Info("reached EOF while getting changed block metadata, returning")
175175
// send changed blocks found till EOF
176-
if err := sendGetMetadataDeltaResponse(stream, vol.VolSize, cb); err != nil {
176+
if err := sendGetMetadataDeltaResponse(stream, vol.VolSize, hp.config.SnapshotMetadataBlockType, cb); err != nil {
177177
return err
178178
}
179179
return nil
@@ -182,30 +182,40 @@ func (hp *hostPath) GetMetadataDelta(req *csi.GetMetadataDeltaRequest, stream cs
182182
return status.Error(codes.Internal, "failed to get changed block metadata")
183183
}
184184
// stream response to client
185-
if err := sendGetMetadataDeltaResponse(stream, vol.VolSize, cb); err != nil {
185+
if err := sendGetMetadataDeltaResponse(stream, vol.VolSize, hp.config.SnapshotMetadataBlockType, cb); err != nil {
186186
return err
187187
}
188188
}
189189
}
190190

191-
func sendGetMetadataDeltaResponse(stream csi.SnapshotMetadata_GetMetadataDeltaServer, volSize int64, cb []*csi.BlockMetadata) error {
191+
func sendGetMetadataDeltaResponse(
192+
stream csi.SnapshotMetadata_GetMetadataDeltaServer,
193+
volSize int64,
194+
blockMetadataType csi.BlockMetadataType,
195+
cb []*csi.BlockMetadata,
196+
) error {
192197
if len(cb) == 0 {
193198
return nil
194199
}
195200
resp := csi.GetMetadataDeltaResponse{
196-
BlockMetadataType: csi.BlockMetadataType_FIXED_LENGTH,
201+
BlockMetadataType: blockMetadataType,
197202
VolumeCapacityBytes: volSize,
198203
BlockMetadata: cb,
199204
}
200205
return stream.Send(&resp)
201206
}
202207

203-
func sendGetMetadataAllocatedResponse(stream csi.SnapshotMetadata_GetMetadataAllocatedServer, volSize int64, cb []*csi.BlockMetadata) error {
208+
func sendGetMetadataAllocatedResponse(
209+
stream csi.SnapshotMetadata_GetMetadataAllocatedServer,
210+
volSize int64,
211+
blockMetadataType csi.BlockMetadataType,
212+
cb []*csi.BlockMetadata,
213+
) error {
204214
if len(cb) == 0 {
205215
return nil
206216
}
207217
resp := csi.GetMetadataAllocatedResponse{
208-
BlockMetadataType: csi.BlockMetadataType_FIXED_LENGTH,
218+
BlockMetadataType: blockMetadataType,
209219
VolumeCapacityBytes: volSize,
210220
BlockMetadata: cb,
211221
}

0 commit comments

Comments
 (0)