Revert "Merge branch 'vi_statemdlFixes' into 'devbranch'"

This reverts merge request !236

statemdl/state.go

@@ -95,7 +95,6 @@ var groupMutex = &sync.Mutex{}
 var serverStartTime time.Time
 
 var clientResponseData clientResponse
-var globalClientResponseData clientResponse
 
 var initStatus = false
 
@@ -416,6 +415,7 @@ func collectStatistics() {
 	// The following lock guards these two underlying data structures.
 	stateMutex.Lock()
 	defer stateMutex.Unlock()
+
 	ba, marshalError := ffjson.Marshal(clientResponseData)
 	if errormdl.CheckErr(marshalError) != nil {
 		loggermdl.LogError(marshalError)

statemdl/state_fasthttp.go

@@ -13,10 +13,8 @@ import (
 func StateHandler(c *routing.Context) error {
 	clientReponseMutex.Lock()
 	defer clientReponseMutex.Unlock()
-	// copy `clientResponseData` into `globalClientResponseData` variable bocs we are facing concurrent read/write issue with `clientResponseData`.
-	globalClientResponseData = clientResponseData
 	c.Response.Header.Set("Access-Control-Allow-Origin", "*")
-	ba, err := json.Marshal(globalClientResponseData)
+	ba, err := json.Marshal(clientResponseData)
 	if err != nil {
 		loggermdl.LogError("Failed to marshall statitics - ", err)
 		c.SetStatusCode(417)

statemdl/state_gin.go

@@ -10,8 +10,6 @@ import (
 func StateHandler(c *gin.Context) {
 	clientReponseMutex.Lock()
 	defer clientReponseMutex.Unlock()
-	// copy `clientResponseData` into `globalClientResponseData` variable bocs we are facing concurrent read/write issue with `clientResponseData`.
-	globalClientResponseData = clientResponseData
 	c.Header("Access-Control-Allow-Origin", "*")
-	c.JSON(200, globalClientResponseData)
+	c.JSON(200, clientResponseData)
 }