remove go.uber.org/atomic

2 files changed, 139 insertions, 33 deletions

diff --git a/weed/shell/command_s3_circuitbreaker.go b/weed/shell/command_s3_circuitbreaker.go
index 7d6eebf34..7e11153bf 100644
--- a/weed/shell/command_s3_circuitbreaker.go
+++ b/weed/shell/command_s3_circuitbreaker.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"github.com/alecthomas/units"
 	"github.com/chrislusf/seaweedfs/weed/filer"
 	"github.com/chrislusf/seaweedfs/weed/pb/s3_pb"
 	"github.com/chrislusf/seaweedfs/weed/s3api/s3_constants"
@@ -61,8 +60,8 @@ func (c *commandS3CircuitBreaker) Do(args []string, commandEnv *CommandEnv, writ
 	global := s3CircuitBreakerCommand.Bool("global", false, "configure global circuit breaker")
 
 	actions := s3CircuitBreakerCommand.String("actions", "", "comma separated actions names: Read,Write,List,Tagging,Admin")
-	limitType := s3CircuitBreakerCommand.String("type", "", "count|bytes simultaneous requests count")
-	values := s3CircuitBreakerCommand.String("values", "", "comma separated max values,Maximum number of simultaneous requests content length, support byte unit: eg: 1k, 10m, 1g")
+	limitType := s3CircuitBreakerCommand.String("type", "", "'Count' or 'MB'; Count represents the number of simultaneous requests, and MB represents the content size of all simultaneous requests")
+	values := s3CircuitBreakerCommand.String("values", "", "comma separated values")
 
 	disabled := s3CircuitBreakerCommand.Bool("disable", false, "disable global or buckets circuit breaker")
 	deleted := s3CircuitBreakerCommand.Bool("delete", false, "delete circuit breaker config")
@@ -326,7 +325,7 @@ func (c *commandS3CircuitBreaker) initActionsAndValues(buckets, actions, limitTy
 					if len(elements) != 1 || len(elements) == 0 {
 						return nil, nil, nil, fmt.Errorf("values count of -actions and -values not equal")
 					}
-					v, err := units.ParseStrictBytes(elements[0])
+					v, err := parseMBToBytes(elements[0])
 					if err != nil {
 						return nil, nil, nil, fmt.Errorf("value of -max must be a legal number(s)")
 					}
@@ -335,7 +334,7 @@ func (c *commandS3CircuitBreaker) initActionsAndValues(buckets, actions, limitTy
 					}
 				} else {
 					for _, value := range elements {
-						v, err := units.ParseStrictBytes(value)
+						v, err := parseMBToBytes(value)
 						if err != nil {
 							return nil, nil, nil, fmt.Errorf("value of -max must be a legal number(s)")
 						}
@@ -351,3 +350,9 @@ func (c *commandS3CircuitBreaker) initActionsAndValues(buckets, actions, limitTy
 	}
 	return cmdBuckets, cmdActions, cmdValues, nil
 }
+
+func parseMBToBytes(valStr string) (int64, error) {
+	v, err := strconv.Atoi(valStr)
+	v *= 1024 * 1024
+	return int64(v), err
+}
diff --git a/weed/shell/command_s3_circuitbreaker_test.go b/weed/shell/command_s3_circuitbreaker_test.go
index 191a62e6a..3d0b4ac6e 100644
--- a/weed/shell/command_s3_circuitbreaker_test.go
+++ b/weed/shell/command_s3_circuitbreaker_test.go
@@ -17,13 +17,13 @@ var (
 	TestCases = []*Case{
 		//add circuit breaker config for global
 		{
-			args: strings.Split("-global -type count -actions Read,Write -values 500,200", " "),
+			args: strings.Split("-global -type Count -actions Read,Write -values 500,200", " "),
 			result: `{
 				"global": {
 					"enabled": true,
 					"actions": {
-						"Read:count": "500",
-						"Write:count": "200"
+						"Read:Count": "500",
+						"Write:Count": "200"
 					}
 				}
 			}`,
@@ -35,8 +35,8 @@ var (
 			result: `{
 				"global": {
 					"actions": {
-						"Read:count": "500",
-						"Write:count": "200"
+						"Read:Count": "500",
+						"Write:Count": "200"
 					}
 				}
 			}`,
@@ -44,34 +44,34 @@ var (
 
 		//add circuit breaker config for buckets x,y,z
 		{
-			args: strings.Split("-buckets x,y,z -type count -actions Read,Write -values 200,100", " "),
+			args: strings.Split("-buckets x,y,z -type Count -actions Read,Write -values 200,100", " "),
 			result: `{
 				"global": {
 					"actions": {
-						"Read:count": "500",
-						"Write:count": "200"
+						"Read:Count": "500",
+						"Write:Count": "200"
 					}
 				},
 				"buckets": {
 					"x": {
 						"enabled": true,
 						"actions": {
-							"Read:count": "200",
-							"Write:count": "100"
+							"Read:Count": "200",
+							"Write:Count": "100"
 						}
 					},
 					"y": {
 						"enabled": true,
 						"actions": {
-							"Read:count": "200",
-							"Write:count": "100"
+							"Read:Count": "200",
+							"Write:Count": "100"
 						}
 					},
 					"z": {
 						"enabled": true,
 						"actions": {
-							"Read:count": "200",
-							"Write:count": "100"
+							"Read:Count": "200",
+							"Write:Count": "100"
 						}
 					}
 				}
@@ -84,29 +84,29 @@ var (
 			result: `{
 			  "global": {
 				"actions": {
-				  "Read:count": "500",
-				  "Write:count": "200"
+				  "Read:Count": "500",
+				  "Write:Count": "200"
 				}
 			  },
 			  "buckets": {
 				"x": {
 				  "actions": {
-					"Read:count": "200",
-					"Write:count": "100"
+					"Read:Count": "200",
+					"Write:Count": "100"
 				  }
 				},
 				"y": {
 				  "enabled": true,
 				  "actions": {
-					"Read:count": "200",
-					"Write:count": "100"
+					"Read:Count": "200",
+					"Write:Count": "100"
 				  }
 				},
 				"z": {
 				  "enabled": true,
 				  "actions": {
-					"Read:count": "200",
-					"Write:count": "100"
+					"Read:Count": "200",
+					"Write:Count": "100"
 				  }
 				}
 			  }
@@ -119,23 +119,124 @@ var (
 			result: `{
 			  "global": {
 				"actions": {
-				  "Read:count": "500",
-				  "Write:count": "200"
+				  "Read:Count": "500",
+				  "Write:Count": "200"
 				}
 			  },
 			  "buckets": {
 				"y": {
 				  "enabled": true,
 				  "actions": {
-					"Read:count": "200",
-					"Write:count": "100"
+					"Read:Count": "200",
+					"Write:Count": "100"
 				  }
 				},
 				"z": {
 				  "enabled": true,
 				  "actions": {
-					"Read:count": "200",
-					"Write:count": "100"
+					"Read:Count": "200",
+					"Write:Count": "100"
+				  }
+				}
+			  }
+			}`,
+		},
+
+		//configure the circuit breaker for the size of the uploaded file for bucket x,y
+		{
+			args: strings.Split("-buckets x,y -type MB -actions Write -values 1024", " "),
+			result: `{
+			  "global": {
+				"actions": {
+				  "Read:Count": "500",
+				  "Write:Count": "200"
+				}
+			  },
+			  "buckets": {
+				"x": {
+				  "enabled": true,
+				  "actions": {
+					"Write:MB": "1073741824"
+				  }
+				},
+				"y": {
+				  "enabled": true,
+				  "actions": {
+					"Read:Count": "200",
+					"Write:Count": "100",
+					"Write:MB": "1073741824"
+				  }
+				},
+				"z": {
+				  "enabled": true,
+				  "actions": {
+					"Read:Count": "200",
+					"Write:Count": "100"
+				  }
+				}
+			  }
+			}`,
+		},
+
+		//delete the circuit breaker configuration for the size of the uploaded file of bucket x,y
+		{
+			args: strings.Split("-buckets x,y -type MB -actions Write -delete", " "),
+			result: `{
+			  "global": {
+				"actions": {
+				  "Read:Count": "500",
+				  "Write:Count": "200"
+				}
+			  },
+			  "buckets": {
+				"x": {
+				  "enabled": true
+				},
+				"y": {
+				  "enabled": true,
+				  "actions": {
+					"Read:Count": "200",
+					"Write:Count": "100"
+				  }
+				},
+				"z": {
+				  "enabled": true,
+				  "actions": {
+					"Read:Count": "200",
+					"Write:Count": "100"
+				  }
+				}
+			  }
+			}`,
+		},
+
+		//enable global circuit breaker config (without -disable flag)
+		{
+			args: strings.Split("-global", " "),
+			result: `{
+			  "global": {
+				"enabled": true,
+				"actions": {
+				  "Read:Count": "500",
+				  "Write:Count": "200"
+				}
+			  },
+			  "buckets": {
+				"x": {
+				  "enabled": true
+				},
+				"y": {
+				  "enabled": true,
+				  "actions": {
+					"Read:Count": "200",
+					"Write:Count": "100"
+				  }
+				},
+				"z": {
+				  "enabled": true,
+				  "actions": {
+					"Read:Count": "200",
+					"Write:Count": "100"
 				  }
 				}
 			  }