Refactor constraints to improve reuse, To #60096268

Signed-off-by: cheyang <[email protected]>
fluid-cloudnative · Nov 3, 2024 · 6a18123 · 6a18123
1 parent 5e7f9e1
commit 6a18123
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 18 deletions.
diff --git a/pkg/ddc/alluxio/const.go b/pkg/ddc/alluxio/const.go
@@ -35,8 +35,6 @@ const (
 
 	metricsPrefixBytesReadUfsThroughput = "Cluster.BytesReadUfsThroughput "
 
-	summaryPrefixUsedCapacity = "Used Capacity: "
-
 	metadataSyncNotDoneMsg = "[Calculating]"
 
 	alluxioRuntimeMetricsLabel = "alluxio_runtime_metrics"

diff --git a/pkg/ddc/alluxio/report.go b/pkg/ddc/alluxio/report.go
@@ -47,8 +47,8 @@ func (e AlluxioEngine) parseReportSummary(s string) cacheStates {
 			// e.g. 10KB -> 10KiB, 2GB -> 2GiB
 			states.cacheCapacity = utils.BytesSize(float64(totalCacheCapacityAlluxio))
 		}
-		if strings.HasPrefix(str, summaryPrefixUsedCapacity) {
-			usedCacheCapacityAlluxio, _ := utils.FromHumanSize(strings.TrimPrefix(str, summaryPrefixUsedCapacity))
+		if strings.HasPrefix(str, ddctypes.SummaryPrefixUsedCapacity) {
+			usedCacheCapacityAlluxio, _ := utils.FromHumanSize(strings.TrimPrefix(str, ddctypes.SummaryPrefixUsedCapacity))
 			// Convert Alluxio's binary byte units to Fluid's binary byte units
 			// e.g. 10KB -> 10KiB, 2GB -> 2GiB
 			states.cached = utils.BytesSize(float64(usedCacheCapacityAlluxio))

diff --git a/pkg/ddc/goosefs/const.go b/pkg/ddc/goosefs/const.go
@@ -33,8 +33,6 @@ const (
 
 	METRICS_PREFIX_BYTES_READ_UFS_THROUGHPUT = "Cluster.BytesReadUfsThroughput "
 
-	SUMMARY_PREFIX_USED_CAPACITY = "Used Capacity: "
-
 	METADATA_SYNC_NOT_DONE_MSG = "[Calculating]"
 
 	GOOSEFS_RUNTIME_METRICS_LABEL = "goosefs_runtime_metrics"

diff --git a/pkg/ddc/goosefs/report.go b/pkg/ddc/goosefs/report.go
@@ -47,8 +47,8 @@ func (e GooseFSEngine) ParseReportSummary(s string) cacheStates {
 			// e.g. 10KB -> 10KiB, 2GB -> 2GiB
 			states.cacheCapacity = utils.BytesSize(float64(totalCacheCapacityGooseFS))
 		}
-		if strings.HasPrefix(str, SUMMARY_PREFIX_USED_CAPACITY) {
-			usedCacheCapacityGooseFS, _ := utils.FromHumanSize(strings.TrimPrefix(str, SUMMARY_PREFIX_USED_CAPACITY))
+		if strings.HasPrefix(str, ddctypes.SummaryPrefixUsedCapacity) {
+			usedCacheCapacityGooseFS, _ := utils.FromHumanSize(strings.TrimPrefix(str, ddctypes.SummaryPrefixUsedCapacity))
 			// Convert GooseFS's binary byte units to Fluid's binary byte units
 			// e.g. 10KB -> 10KiB, 2GB -> 2GiB
 			states.cached = utils.BytesSize(float64(usedCacheCapacityGooseFS))

diff --git a/pkg/ddc/jindo/cache.go b/pkg/ddc/jindo/cache.go
@@ -44,8 +44,8 @@ func (e *JindoEngine) queryCacheStatus() (states cacheStates, err error) {
 			// e.g. 10KB -> 10KiB, 2GB -> 2GiB
 			states.cacheCapacity = utils.BytesSize(float64(totalCacheCapacityJindo))
 		}
-		if strings.HasPrefix(str, SUMMARY_PREFIX_USED_CAPACITY) {
-			usedCacheCapacityJindo, _ := utils.FromHumanSize(strings.TrimPrefix(str, SUMMARY_PREFIX_USED_CAPACITY))
+		if strings.HasPrefix(str, ddctypes.SummaryPrefixUsedCapacity) {
+			usedCacheCapacityJindo, _ := utils.FromHumanSize(strings.TrimPrefix(str, ddctypes.SummaryPrefixUsedCapacity))
 			// Convert JindoFS's binary byte units to Fluid's binary byte units
 			// e.g. 10KB -> 10KiB, 2GB -> 2GiB
 			states.cached = utils.BytesSize(float64(usedCacheCapacityJindo))

diff --git a/pkg/ddc/jindo/const.go b/pkg/ddc/jindo/const.go
@@ -17,8 +17,6 @@ limitations under the License.
 package jindo
 
 const (
-	SUMMARY_PREFIX_USED_CAPACITY = "Used Capacity: "
-
 	METADATA_SYNC_NOT_DONE_MSG = "[Calculating]"
 
 	CHECK_METADATA_SYNC_DONE_TIMEOUT_MILLISEC = 500

diff --git a/pkg/ddc/jindocache/cache.go b/pkg/ddc/jindocache/cache.go
@@ -42,7 +42,7 @@ func (e *JindoCacheEngine) queryCacheStatus() (states cacheStates, err error) {
 		usedCapacityLabel = SUMMARY_PREFIX_USED_MEM_CAPACITY
 	} else {
 		totalCapacityLabel = ddctypes.SummaryPrefixTotalDiskCapacity
-		usedCapacityLabel = SUMMARY_PREFIX_USED_CAPACITY
+		usedCapacityLabel = ddctypes.SummaryPrefixUsedDiskCapacity
 	}
 	strs := strings.Split(summary, "\n")
 	for _, str := range strs {

diff --git a/pkg/ddc/jindocache/const.go b/pkg/ddc/jindocache/const.go
@@ -23,8 +23,6 @@ const (
 
 	Mount_TYPE = "mount_type"
 
-	SUMMARY_PREFIX_USED_CAPACITY = "Used Disk Capacity: "
-
 	SUMMARY_PREFIX_TOTAL_MEM_CAPACITY = "Total MEM Capacity: "
 
 	SUMMARY_PREFIX_USED_MEM_CAPACITY = "Used MEM Capacity: "

diff --git a/pkg/ddc/jindofsx/cache.go b/pkg/ddc/jindofsx/cache.go
@@ -42,7 +42,7 @@ func (e *JindoFSxEngine) queryCacheStatus() (states cacheStates, err error) {
 		usedCapacityLabel = SUMMARY_PREFIX_USED_MEM_CAPACITY
 	} else {
 		totalCapacityLabel = ddctypes.SummaryPrefixTotalDiskCapacity
-		usedCapacityLabel = SUMMARY_PREFIX_USED_CAPACITY
+		usedCapacityLabel = ddctypes.SummaryPrefixUsedDiskCapacity
 	}
 	strs := strings.Split(summary, "\n")
 	for _, str := range strs {

diff --git a/pkg/ddc/jindofsx/const.go b/pkg/ddc/jindofsx/const.go
@@ -23,8 +23,6 @@ const (
 
 	Mount_TYPE = "mount_type"
 
-	SUMMARY_PREFIX_USED_CAPACITY = "Used Disk Capacity: "
-
 	SUMMARY_PREFIX_TOTAL_MEM_CAPACITY = "Total MEM Capacity: "
 
 	SUMMARY_PREFIX_USED_MEM_CAPACITY = "Used MEM Capacity: "

diff --git a/pkg/ddc/types/constants.go b/pkg/ddc/types/constants.go
@@ -19,5 +19,9 @@ package types
 const (
 	SummaryPrefixTotalCapacity = "Total Capacity: "
 
+	SummaryPrefixUsedCapacity = "Used Capacity: "
+
 	SummaryPrefixTotalDiskCapacity = "Total Disk Capacity: "
+
+	SummaryPrefixUsedDiskCapacity = "Used Disk Capacity: "
 )