iocost: using default io.cost.model

default io.cost.model applied to HDD disks

Signed-off-by: Robin Lu <robin.lu@bytedance.com>

pkg/agent/qrm-plugins/io/handlers/iocost/iocost_linux.go

@@ -41,45 +41,40 @@ var (
 	ioCgroupRootPath = cgcommon.GetCgroupRootPath(cgcommon.CgroupSubsysIO)
 )
 
-func applyIOCostModel(ioCostModelConfigs map[DevModel]*common.IOCostModelData, devsIDToModel map[string]DevModel) {
+func applyIOCostModelWithDefault(ioCostModelConfigs map[DevModel]*common.IOCostModelData, devsIDToModel map[string]DevModel) {
 	curDevIDToIOCostModelData, err := manager.GetIOCostModelWithAbsolutePath(ioCgroupRootPath)
 	if err != nil {
 		general.Errorf("GetIOCostModelWithAbsolutePath failed with error: %v", err)
 		return
 	}
 
-	for devID, devModel := range devsIDToModel {
+	for devID := range devsIDToModel {
 		var expectedModelData, curModelData *common.IOCostModelData
 
-		if ioCostModelConfigs[devModel] != nil {
-			expectedModelData = ioCostModelConfigs[devModel]
-		} else {
-			expectedModelData = ioCostModelConfigs[DevModelDefault]
-		}
-
+		expectedModelData = ioCostModelConfigs[DevModelDefault]
 		if expectedModelData == nil {
-			general.Errorf("there is no expected io cost Model Data for devID: %s, devModel: %s", devID, devModel)
+			general.Errorf("there is no expected io cost Model Data for devID: %s", devID)
 			continue
 		}
 
 		curModelData = curDevIDToIOCostModelData[devID]
 		if curModelData == nil {
-			general.Errorf("there is no current io cost Model Data for devID: %s, devModel: %s", devID, devModel)
+			general.Errorf("there is no current io cost Model Data for devID: %s", devID)
 			continue
 		}
 
 		if (*curModelData) != (*expectedModelData) {
 			err = manager.ApplyIOCostModelWithAbsolutePath(ioCgroupRootPath, devID, expectedModelData)
 			if err != nil {
-				general.Errorf("ApplyIOCostModelWithAbsolutePath for devID: %s, devModel: %s, failed with error: %v",
-					devID, devModel, err)
+				general.Errorf("ApplyIOCostModelWithAbsolutePath for devID: %s, failed with error: %v",
+					devID, err)
 			} else {
-				general.Errorf("ApplyIOCostModelWithAbsolutePath for devID: %s, devModel: %s successfully",
-					devID, devModel)
+				general.Infof("ApplyIOCostModelWithAbsolutePath for devID: %s successfully:%v ",
+					devID, expectedModelData)
 			}
 		} else {
-			general.Infof("modelData isn't changed, skip ApplyIOCostModelWithAbsolutePath for devID: %s, devModel: %s ",
-				devID, devModel)
+			general.Infof("modelData isn't changed, skip ApplyIOCostModelWithAbsolutePath for devID: %s, modelData=%v ",
+				devID, expectedModelData)
 		}
 	}
 }
@@ -242,7 +237,7 @@ func applyIOCostConfig(conf *config.Configuration, emitter metrics.MetricEmitter
 	}
 
 	applyIOCostQoSWithDefault(ioCostQoSConfigs, devsIDToModel)
-	applyIOCostModel(ioCostModelConfigs, devsIDToModel)
+	applyIOCostModelWithDefault(ioCostModelConfigs, devsIDToModel)
 }
 
 func SetIOCost(conf *coreconfig.Configuration,

pkg/agent/qrm-plugins/io/handlers/iocost/iocost_linux_test.go

@@ -372,7 +372,22 @@ func Test_applyIOCostModel(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			applyIOCostModel(tt.args.ioCostModelConfigs, tt.args.devsIDToModel)
+			applyIOCostModelWithDefault(tt.args.ioCostModelConfigs, tt.args.devsIDToModel)
 		})
 	}
 }
+
+func TestApplyIOCostQoSWithDefault(t *testing.T) {
+	// Mocking the necessary dependencies
+	ioCostQoSConfigs := make(map[DevModel]*common.IOCostQoSData)
+	ioCostQoSConfigs[DevModelDefaultHDD] = &common.IOCostQoSData{Enable: 1}
+	ioCostQoSConfigs[DevModelDefault] = &common.IOCostQoSData{Enable: 1}
+
+	devsIDToModel := map[string]DevModel{
+		"devID1": DevModelDefaultHDD,
+		"devID2": DevModelDefaultHDD,
+	}
+
+	// Call the function under test
+	applyIOCostQoSWithDefault(ioCostQoSConfigs, devsIDToModel)
+}

pkg/util/cgroup/manager/v2/fs_linux.go

@@ -199,6 +199,10 @@ func (m *manager) ApplyIOCostModel(absCgroupPath string, devID string, data *com
 	}
 
 	dataContent := data.String()
+	if data.CtrlMode == common.IOCostCtrlModeAuto {
+		dataContent = "ctrl=auto"
+	}
+
 	if err, applied, oldData := common.WriteFileIfChange(absCgroupPath, "io.cost.model", fmt.Sprintf("%s %s", devID, dataContent)); err != nil {
 		return err
 	} else if applied {