Merge pull request #33 from JaD1ng/fix/remove-disk

Fix/remove disk

Author: JaD1ng

mock/s3/API.md

@@ -1149,7 +1149,7 @@ curl -X POST http://localhost:8085/api/v1/metric-anomaly \
     "metric_name": "system_machine_online_status",
     "anomaly_type": "machine_down",
     "enabled": true,
-    "target_value": 0.0,
+    "target_value": 80.0,
     "duration": 60000000000,
     "max_triggers": 1
   }'

mock/s3/README.md

@@ -34,7 +34,6 @@
 |---------|---------|----------|
 | **CPU峰值** | 真实CPU密集计算 | CPU使用率、负载、响应时间 |
 | **内存泄露** | 实际分配内存不释放 | 内存使用率、GC频率、OOM事件 |
-| **磁盘满载** | 创建大文件占用磁盘 | 磁盘使用率、I/O延迟、写入失败 |
 | **网络风暴** | 大量并发连接 | 网络带宽、连接数、超时率 |
 | **服务宕机** | 完整服务停止响应 | 服务健康状态、请求成功率 |
 

mock/s3/deployments/observability/grafana/dashboards/mock-s3-services-metrics.json

@@ -200,42 +200,6 @@
         "y": 9
       }
     },
-    {
-      "id": 5,
-      "title": "Services Disk Usage",
-      "type": "timeseries",
-      "targets": [
-        {
-          "expr": "system_disk_usage_percent_percent{service=~\"$service\"}",
-          "legendFormat": "{{service}} Disk",
-          "refId": "A"
-        }
-      ],
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisPlacement": "auto",
-            "axisLabel": "Disk Usage (%)",
-            "drawStyle": "line",
-            "lineInterpolation": "smooth",
-            "lineWidth": 2,
-            "fillOpacity": 20
-          },
-          "unit": "percent",
-          "min": 0,
-          "max": 100
-        }
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 17
-      }
-    },
     {
       "id": 6,
       "title": "Services Network QPS",
@@ -266,8 +230,8 @@
       },
       "gridPos": {
         "h": 9,
-        "w": 12,
-        "x": 12,
+        "w": 24,
+        "x": 0,
         "y": 17
       }
     },
@@ -337,11 +301,6 @@
           "expr": "system_memory_usage_percent_percent{service=~\"$service\"}",
           "legendFormat": "{{service}} Memory",
           "refId": "B"
-        },
-        {
-          "expr": "system_disk_usage_percent_percent{service=~\"$service\"}",
-          "legendFormat": "{{service}} Disk",
-          "refId": "C"
         }
       ],
       "fieldConfig": {
@@ -405,24 +364,17 @@
           "instant": true,
           "format": "table"
         },
-        {
-          "expr": "system_disk_usage_percent_percent{service=~\"$service\"}",
-          "legendFormat": "",
-          "refId": "C",
-          "instant": true,
-          "format": "table"
-        },
         {
           "expr": "system_network_qps_per_second{service=~\"$service\"}",
           "legendFormat": "",
-          "refId": "D",
+          "refId": "C",
           "instant": true,
           "format": "table"
         },
         {
           "expr": "system_machine_online_status{service=~\"$service\"}",
           "legendFormat": "",
-          "refId": "E",
+          "refId": "D",
           "instant": true,
           "format": "table"
         }
@@ -447,9 +399,8 @@
               "service": "Service",
               "Value #A": "CPU (%)",
               "Value #B": "Memory (%)",
-              "Value #C": "Disk (%)",
-              "Value #D": "Network QPS",
-              "Value #E": "Status"
+              "Value #C": "Network QPS",
+              "Value #D": "Status"
             }
           }
         }

mock/s3/shared/middleware/error_injection/cpu_spike_injector.go

@@ -3,18 +3,26 @@ package error_injection
 import (
 	"context"
 	"mocks3/shared/observability"
+	"os"
 	"runtime"
+	"strconv"
+	"strings"
 	"sync"
 	"time"
 )
 
 // CPUSpikeInjector CPU峰值异常注入器
 type CPUSpikeInjector struct {
-	logger     *observability.Logger
-	isActive   bool
-	mu         sync.RWMutex
-	stopChan   chan struct{}
-	goroutines []chan struct{}
+	logger        *observability.Logger
+	isActive      bool
+	mu            sync.RWMutex
+	stopChan      chan struct{}
+	goroutines    []chan struct{}
+	targetPercent float64 // 目标CPU使用率
+	// CPU统计
+	lastTotal  uint64
+	lastIdle   uint64
+	lastUpdate time.Time
 }
 
 // NewCPUSpikeInjector 创建CPU峰值异常注入器
@@ -36,6 +44,7 @@ func (c *CPUSpikeInjector) StartCPUSpike(ctx context.Context, targetCPUPercent f
 	}
 
 	c.isActive = true
+	c.targetPercent = targetCPUPercent
 	c.logger.Info(ctx, "Starting CPU spike injection",
 		observability.Float64("target_cpu_percent", targetCPUPercent),
 		observability.String("duration", duration.String()))
@@ -76,6 +85,7 @@ func (c *CPUSpikeInjector) StopCPUSpike(ctx context.Context) {
 
 	c.logger.Info(ctx, "Stopping CPU spike injection")
 	c.isActive = false
+	c.targetPercent = 0
 
 	// 停止所有CPU密集型协程
 	for _, stopChan := range c.goroutines {
@@ -91,23 +101,112 @@ func (c *CPUSpikeInjector) IsActive() bool {
 	return c.isActive
 }
 
+// GetCurrentCPUUsage 获取当前CPU使用率
+func (c *CPUSpikeInjector) GetCurrentCPUUsage() float64 {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+
+	if !c.isActive {
+		return c.readSystemCPUUsage()
+	}
+
+	// CPU注入活跃时，读取真实的CPU使用率
+	return c.readSystemCPUUsage()
+}
+
+// readSystemCPUUsage 读取系统真实CPU使用率
+func (c *CPUSpikeInjector) readSystemCPUUsage() float64 {
+	// 读取/proc/stat获取CPU统计
+	data, err := os.ReadFile("/proc/stat")
+	if err != nil {
+		return 0.0
+	}
+
+	lines := strings.Split(string(data), "\n")
+	if len(lines) == 0 {
+		return 0.0
+	}
+
+	// 解析第一行 CPU总计
+	fields := strings.Fields(lines[0])
+	if len(fields) < 8 || fields[0] != "cpu" {
+		return 0.0
+	}
+
+	// 解析CPU时间值
+	var values [7]uint64
+	for i := 0; i < 7; i++ {
+		val, err := strconv.ParseUint(fields[i+1], 10, 64)
+		if err != nil {
+			return 0.0
+		}
+		values[i] = val
+	}
+
+	// 计算总时间和空闲时间
+	total := values[0] + values[1] + values[2] + values[3] + values[4] + values[5] + values[6]
+	idle := values[3] + values[4] // idle + iowait
+
+	now := time.Now()
+
+	// 第一次读取，保存基准值
+	if c.lastTotal == 0 {
+		c.lastTotal = total
+		c.lastIdle = idle
+		c.lastUpdate = now
+		return 0.0
+	}
+
+	// 计算时间差值
+	totalDiff := total - c.lastTotal
+	idleDiff := idle - c.lastIdle
+
+	// 更新基准值
+	c.lastTotal = total
+	c.lastIdle = idle
+	c.lastUpdate = now
+
+	// 计算CPU使用率
+	if totalDiff > 0 {
+		cpuUsage := float64(totalDiff-idleDiff) / float64(totalDiff) * 100.0
+		if cpuUsage < 0 {
+			cpuUsage = 0
+		}
+		if cpuUsage > 100 {
+			cpuUsage = 100
+		}
+		return cpuUsage
+	}
+
+	return 0.0
+}
+
 // cpuIntensiveTask CPU密集型任务
 func (c *CPUSpikeInjector) cpuIntensiveTask(stopChan chan struct{}) {
 	for {
 		select {
 		case <-stopChan:
 			return
 		default:
-			// 执行CPU密集型计算
-			for i := 0; i < 10000; i++ {
+			// 执行CPU密集型计算，减少频繁让出CPU
+			for i := 0; i < 1000000; i++ {
 				_ = i * i * i
 			}
-			// 短暂让出CPU，避免完全阻塞
-			runtime.Gosched()
+			// 降低让出CPU的频率，每完成大量计算后才让出
+			if c.shouldYield() {
+				runtime.Gosched()
+			}
 		}
 	}
 }
 
+// shouldYield 控制让出CPU的频率，避免过于频繁的调度
+func (c *CPUSpikeInjector) shouldYield() bool {
+	// 只有在非常必要时才让出CPU，大幅减少调度频率
+	// 可以根据系统负载动态调整
+	return false // 暂时完全禁用主动让出，让系统调度器控制
+}
+
 // Cleanup 清理资源
 func (c *CPUSpikeInjector) Cleanup() {
 	close(c.stopChan)