fix:fix abort

Author: spring-young

pkg/apis/ctrlmesh/proto/faultinjection.pb.go

@@ -17,11 +17,6 @@ message FaultInjectConfigResp {
   string message = 2;
 }
 
-enum FaultInjectionState {
-  STATEOPENED = 0;
-  STATECLOSED = 1;
-}
-
 message FaultInjection {
   repeated HTTPFaultInjection httpFaultInjections = 1;
 

pkg/apis/ctrlmesh/proto/faultinjection.proto

@@ -145,7 +145,7 @@ func TestCircuitBreaker(t *testing.T) {
 	g.Expect(c.Update(ctx, cb)).Should(gomega.BeNil())
 	waitProcess()
 	g.Expect(c.Get(ctx, types.NamespacedName{Name: "testcb", Namespace: "default"}, cb)).Should(gomega.BeNil())
-	g.Expect(breakerManager.ValidateTrafficIntercept("aaa.aaa.aaa", "GET").Allowed).Should(gomega.BeFalse())
+	g.Expect(breakerManager.ValidateTrafficIntercept("aaa.aaa.aaa", "GET").Allowed).Should(gomega.BeTrue())
 	if cb.Labels == nil {
 		cb.Labels = map[string]string{}
 	}

pkg/manager/controllers/circuitbreaker/circuitbreaker_controller_test.go

@@ -104,7 +104,7 @@ var faultInjection = &ctrlmeshv1alpha1.FaultInjection{
 	},
 }
 
-func TestCircuitBreaker(t *testing.T) {
+func TestFaultInjection(t *testing.T) {
 	g := gomega.NewGomegaWithT(t)
 	defer Stop()
 	RunMockServer()
@@ -163,6 +163,7 @@ func TestCircuitBreaker(t *testing.T) {
 	g.Expect(c.Update(ctx, cb)).Should(gomega.BeNil())
 	waitProcess()
 	g.Expect(c.Get(ctx, types.NamespacedName{Name: "testcb", Namespace: "default"}, cb)).Should(gomega.BeNil())
+	waitProcess()
 	g.Expect(faultManager.FaultInjectionRest("aaa.aaa.aaa", "GET").Abort).Should(gomega.BeTrue())
 	if cb.Labels == nil {
 		cb.Labels = map[string]string{}

pkg/manager/controllers/faultinjection/faultinjection_controller_test.go

@@ -71,7 +71,7 @@ func (t *tproxy) handleHTTP(resp http.ResponseWriter, req *http.Request) {
 	// ValidateRest check
 	logger.Info("start ValidateRest checkrule ", "realEndPointUrl.Host", realEndPointUrl.Host, "req.Method", req.Method)
 	result := t.FaultInjector.FaultInjectionRest(req.Header.Get(meshhttp.HeaderMeshRealEndpoint), req.Method)
-	if !result.Abort {
+	if result.Abort {
 		apiErr := httpToAPIError(int(result.ErrCode), result.Message)
 		if apiErr.Code != http.StatusOK {
 			resp.Header().Set("Content-Type", "application/json")

pkg/proxy/faultinjection/faultinjection_proxy.go

@@ -22,8 +22,6 @@ import (
 	"time"
 
 	"k8s.io/client-go/util/workqueue"
-
-	ctrlmeshproto "github.com/KusionStack/controller-mesh/pkg/apis/ctrlmesh/proto"
 )
 
 type lease struct {
@@ -44,21 +42,6 @@ func newFaultInjectionLease(ctx context.Context) *lease {
 	return result
 }
 
-func (l *lease) registerState(st *state) {
-	if st.state == ctrlmeshproto.FaultInjectionState_STATEOPENED {
-		logger.Info("register state", "state", st.key)
-		l.mu.Lock()
-		defer l.mu.Unlock()
-		if _, ok := l.stateSet[st.key]; !ok {
-			if st.recoverAt != nil {
-				l.stateSet[st.key] = st
-				d := time.Until(st.recoverAt.Time)
-				l.stateQueue.AddAfter(st, d)
-			}
-		}
-	}
-}
-
 func (l *lease) processingLoop() {
 	go func() {
 		<-l.ctx.Done()
@@ -70,7 +53,7 @@ func (l *lease) processingLoop() {
 			return
 		}
 		st := obj.(*state)
-		_, _, recoverAt := st.read()
+		recoverAt := st.read()
 		if recoverAt != nil && time.Now().Before(recoverAt.Time) {
 			// recover time changed, requeue
 			l.stateQueue.AddAfter(st, time.Until(recoverAt.Time))

pkg/proxy/faultinjection/lease.go

@@ -24,7 +24,6 @@ import (
 	"math/rand"
 	"net/http"
 	"net/url"
-	"os"
 	"strings"
 	"sync"
 	"time"
@@ -35,17 +34,15 @@ import (
 
 	// pkgfi "github.com/KusionStack/controller-mesh/circuitbreaker"
 
-	"github.com/KusionStack/controller-mesh/pkg/apis/ctrlmesh/constants"
 	ctrlmeshproto "github.com/KusionStack/controller-mesh/pkg/apis/ctrlmesh/proto"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const timeLayout = "15:04:05"
 
 var (
-	logger                   = logf.Log.WithName("fault-injection-manager")
-	randNum                  = rand.New(rand.NewSource(time.Now().UnixNano()))
-	enableRestFaultInjection = os.Getenv(constants.EnvEnableRestFaultInjection) == "true"
+	logger  = logf.Log.WithName("fault-injection-manager")
+	randNum = rand.New(rand.NewSource(time.Now().UnixNano()))
 )
 
 type ManagerInterface interface {
@@ -166,7 +163,7 @@ func (m *manager) FaultInjectionRest(URL string, method string) (result *FaultIn
 		result = m.doFaultInjection(faultInjections, states)
 		return result
 	}
-	result = &FaultInjectionResult{Abort: true, Reason: "No rule match"}
+	result = &FaultInjectionResult{Abort: false, Reason: "No rule match"}
 	return result
 }
 
@@ -204,7 +201,7 @@ func (m *manager) FaultInjectionResource(namespace, apiGroup, resource, verb str
 		result = m.doFaultInjection(faultInjections, states)
 		return result
 	}
-	result = &FaultInjectionResult{Abort: true, Reason: "No rule match"}
+	result = &FaultInjectionResult{Abort: false, Reason: "No rule match"}
 	return result
 }
 
@@ -251,7 +248,7 @@ func withFaultInjection(injector FaultInjector, handler http.Handler) http.Handl
 		}
 		result := injector.FaultInjectionResource(requestInfo.Namespace, requestInfo.APIGroup, requestInfo.Resource, requestInfo.Verb)
 
-		if !result.Abort {
+		if result.Abort {
 			apiErr := httpToAPIError(int(result.ErrCode), result.Message)
 			if apiErr.Code != http.StatusOK {
 				w.Header().Set("Content-Type", "application/json")
@@ -268,7 +265,7 @@ func withFaultInjection(injector FaultInjector, handler http.Handler) http.Handl
 
 func (m *manager) doFaultInjection(faultInjections []*ctrlmeshproto.HTTPFaultInjection, states []*state) *FaultInjectionResult {
 	result := &FaultInjectionResult{
-		Abort:  true,
+		Abort:  false,
 		Reason: "Default allow",
 	}
 	for idx := range faultInjections {
@@ -288,14 +285,13 @@ func (m *manager) doFaultInjection(faultInjections []*ctrlmeshproto.HTTPFaultInj
 		}
 		if faultInjections[idx].Abort != nil {
 			if isInpercentRange(faultInjections[idx].Abort.Percent) {
-				result.Abort = false
+				result.Abort = true
 				result.Reason = "FaultInjectionTriggered"
 				result.Message = fmt.Sprintf("the fault injection is triggered. Limiting rule name: %s", faultInjections[idx].Name)
 				result.ErrCode = faultInjections[idx].Abort.GetHttpStatus()
 			}
 
 		}
-		states[idx].triggerFaultInjection()
 	}
 	return result
 }