Skip to content

Commit d018f11

Browse files
committed
Update the default cache unit to GiB from MiB
1 parent 1016fb3 commit d018f11

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

cmd/gce-pd-csi-driver/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,10 @@ func handle() {
242242

243243
if *enableNodeDataCacheFlag {
244244
if nodeName == nil || *nodeName == "" {
245-
klog.Fatalf("Data cache enabled, but --node-name not passed")
245+
klog.Errorf("Data cache enabled, but --node-name not passed")
246246
}
247247
if err := setupDataCache(ctx, *nodeName); err != nil {
248-
klog.Fatalf("DataCache setup failed: %v", err)
248+
klog.Errorf("DataCache setup failed: %v", err)
249249
}
250250
}
251251

pkg/common/parameters.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ func ExtractAndDefaultParameters(parameters map[string]string, driverName string
251251
return p, d, fmt.Errorf("parameters contain invalid dataCacheSize parameter: %w", err)
252252
}
253253
d.DataCacheSize = strconv.FormatInt(paramDataCacheSize, 10)
254-
klog.V(2).Infof("====== Data cache size is %v ======", v)
254+
klog.V(2).Infof("====== Data cache size is %v GiB ======", d.DataCacheSize)
255255
case ParameterKeyDataCacheMode:
256256
if !enableDataCache {
257257
return p, d, fmt.Errorf("data caching enabled %v; parameters contains invalid option %q", enableDataCache, ParameterKeyDataCacheSize)
@@ -260,7 +260,7 @@ func ExtractAndDefaultParameters(parameters map[string]string, driverName string
260260
return p, d, fmt.Errorf("parameters contains invalid option: %w", err)
261261
}
262262
d.DataCacheMode = v
263-
klog.V(2).Infof("====== Data cache mode is %v ======", v)
263+
klog.V(2).Infof("====== Data cache mode is %v ======", d.DataCacheMode)
264264
case ParameterKeyResourceTags:
265265
if err := extractResourceTagsParameter(v, p.ResourceTags); err != nil {
266266
return p, d, err

pkg/gce-pd-csi-driver/cache.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,15 @@ func setupCaching(devicePath string, req *csi.NodeStageVolumeRequest, nodeId str
164164
} else {
165165
fastCacheSize := req.GetPublishContext()[common.ContexLocalSsdCacheSize]
166166
chunkSize := "960" // Cannot use default chunk size(64KiB) as it errors on maxChunksAllowed. Unit - KiB
167-
klog.V(2).Infof("============================== fastCacheSize is %v ==============================", fastCacheSize)
167+
klog.V(2).Infof("============================== fastCacheSize is %v GiB ==============================", fastCacheSize)
168168
klog.V(2).Infof("============================== lvcreate fast cache layer again with the VolumeGroup %v==============================", volumeGroupName)
169169
args = []string{
170170
"--yes",
171171
"-n",
172172
cacheLvName,
173173
"-L",
174-
fastCacheSize,
174+
// ConvertGiStringToInt64 converts the input size to GiB so default to "g" for cache size - LVM g|G is GiB.
175+
fastCacheSize + "g",
175176
volumeGroupName,
176177
raidedLocalSsdPath,
177178
}

0 commit comments

Comments
 (0)