Merge pull request #1238 from tigrisdata/main

Release Beta
tigrisdata-archive · May 24, 2023 · ac4ae91 · ac4ae91
2 parents 99ea269 + 5075bca
commit ac4ae91
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/server/metrics/measurement.go b/server/metrics/measurement.go
@@ -157,13 +157,15 @@ func (*Measurement) CountUnits(reqStatus *RequestStatus, tags map[string]string)
 	writeBytes := reqStatus.GetWriteBytes()
 	RequestsReadBytes.Tagged(tags).Counter("bytes").Inc(readBytes)
 	RequestsWriteBytes.Tagged(tags).Counter("bytes").Inc(writeBytes)
+	RequestsSearchWriteBytes.Tagged(tags).Counter("bytes").Inc(reqStatus.searchWriteBytes)
 	RequestsReadUnits.Tagged(tags).Counter("units").Inc(getUnitsFromBytes(readBytes, config.ReadUnitSize))
 	RequestsWriteUnits.Tagged(tags).Counter("units").Inc(getUnitsFromBytes(writeBytes, config.WriteUnitSize))
 	RequestsDDLDropUnits.Tagged(tags).Counter("units").Inc(reqStatus.GetDDLDropUnits())
 	RequestsDDLUpdateUnits.Tagged(tags).Counter("units").Inc(reqStatus.GetDDLUpdateUnits())
 	RequestsDDLCreateUnits.Tagged(tags).Counter("units").Inc(reqStatus.GetDDLCreateUnits())
 	RequestsCollectionSearchUnits.Tagged(tags).Counter("units").Inc(reqStatus.GetCollectionSearchUnits())
 	RequestsApiSearchUnits.Tagged(tags).Counter("units").Inc(reqStatus.GetApiSearchUnits())
+	RequestsSearchWriteUnits.Tagged(tags).Counter("units").Inc(getUnitsFromBytes(reqStatus.searchWriteBytes, config.SearchUnitSize))
 }
 
 func (m *Measurement) CountErrorForScope(scope tally.Scope, tags map[string]string) {

diff --git a/server/metrics/requests.go b/server/metrics/requests.go
@@ -33,6 +33,8 @@ var (
 	RequestsDDLCreateUnits        tally.Scope
 	RequestsApiSearchUnits        tally.Scope
 	RequestsCollectionSearchUnits tally.Scope
+	RequestsSearchWriteBytes      tally.Scope
+	RequestsSearchWriteUnits      tally.Scope
 )
 
 func getRequestOkTagKeys() []string {
@@ -98,4 +100,6 @@ func initializeRequestScopes() {
 	RequestsDDLCreateUnits = Requests.SubScope("ddl_create")
 	RequestsCollectionSearchUnits = Requests.SubScope("collection_search")
 	RequestsApiSearchUnits = Requests.SubScope("api_search")
+	RequestsSearchWriteBytes = Requests.SubScope("search_write")
+	RequestsSearchWriteUnits = Requests.SubScope("search_write")
 }
diff --git a/server/middleware/authz.go b/server/middleware/authz.go
@@ -73,7 +73,7 @@ var (
 		api.QuotaLimitsMetricsMethodName,
 		api.QuotaUsageMethodName,
 		api.GetInfoMethodName,
-		
+
 		// realtime
 		api.ReadMessagesMethodName,
 

diff --git a/server/quota/storage.go b/server/quota/storage.go
@@ -147,6 +147,7 @@ func getProjectSearchSize(ctx context.Context, tenant *metadata.Tenant, project
 	if ulog.E(err) {
 		return 0
 	}
+	log.Debug().Int64("search_byte_size", prjSearchSize.StoredBytes).Msg("Got search size")
 	return prjSearchSize.StoredBytes
 }
 

diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml
@@ -225,8 +225,8 @@ services:
       - GOTRUE_DB_URL=http://tigris_server:8081
       - GOTRUE_SITE_URL=http://tigris_gotrue:8086
       - GOTRUE_JWT_ALGORITHM=RS256
-      - GOTRUE_JWT_RSA_PRIVATE_KEY=/home/netlify/keys/jwt.test.key
-      - GOTRUE_JWT_RSA_PUBLIC_KEYS=/home/netlify/keys/jwt.test.key.pub
+      - GOTRUE_JWT_RSA_PRIVATE_KEY=/home/tigris/keys/jwt.test.key
+      - GOTRUE_JWT_RSA_PUBLIC_KEYS=/home/tigris/keys/jwt.test.key.pub
       - GOTRUE_DISABLE_SIGNUP=false
       - GOTRUE_JWT_EXP=300
       - GOTRUE_JWT_ISSUER=http://tigris_gotrue:8086