fix: Namespace read from storage, if cache misses

server/metadata/tenant.go

@@ -192,13 +192,40 @@ func (m *TenantManager) CreateTenant(ctx context.Context, tx transaction.Tx, nam
 	return namespace, nil
 }
 
-func (m *TenantManager) GetNamespace(namespaceName string) Namespace {
+func (m *TenantManager) GetNamespace(ctx context.Context, namespaceName string, txMgr *transaction.Manager) (Namespace, error) {
 	m.RLock()
-	defer m.RUnlock()
 	if tenant, found := m.tenants[namespaceName]; found {
-		return tenant.namespace
+		m.RUnlock()
+		return tenant.namespace, nil
 	}
-	return nil
+	m.RUnlock()
+
+	m.Lock()
+	defer m.Unlock()
+	if tenant, found := m.tenants[namespaceName]; found {
+		return tenant.namespace, nil
+	}
+	// this will never create new namespace
+	// this is for reading namespaces from storage into cache
+	tx, err := txMgr.StartTx(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	namespaces, err := m.encoder.GetNamespaces(ctx, tx)
+	if err != nil {
+		_ = tx.Rollback(ctx)
+		log.Warn().Msg("Could not get namespaces")
+		return nil, err
+	}
+	err = tx.Commit(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if id, ok := namespaces[namespaceName]; ok {
+		return NewTenantNamespace(namespaceName, id), nil
+	}
+	return nil, api.Errorf(api.Code_NOT_FOUND, "Namespace not found")
 }
 
 func (m *TenantManager) createOrGetTenantInternal(ctx context.Context, tx transaction.Tx, namespace Namespace) (*Tenant, error) {

server/midddleware/request_metadata.go

@@ -39,14 +39,15 @@ func GetRequestMetadata(ctx context.Context) (*RequestMetadata, error) {
 }
 
 func setAccessToken(ctx context.Context, token *AccessToken) context.Context {
-	requestMetadata, err := GetRequestMetadata(ctx)
-	var result = ctx
-	if err != nil && requestMetadata == nil {
+	requestMetadata, _ := GetRequestMetadata(ctx)
+	if requestMetadata == nil {
 		requestMetadata = &RequestMetadata{}
-		result = context.WithValue(ctx, RequestMetadataCtxKey{}, requestMetadata)
+		requestMetadata.accessToken = token
+		return context.WithValue(ctx, RequestMetadataCtxKey{}, requestMetadata)
+	} else {
+		requestMetadata.accessToken = token
+		return context.WithValue(ctx, RequestMetadataCtxKey{}, requestMetadata)
 	}
-	requestMetadata.accessToken = token
-	return result
 }
 
 func setNamespace(ctx context.Context, namespace string) context.Context {
@@ -61,9 +62,9 @@ func setNamespace(ctx context.Context, namespace string) context.Context {
 }
 func GetAccessToken(ctx context.Context) (*AccessToken, error) {
 	// read token
-	value := ctx.Value(&RequestMetadataCtxKey{})
+	value := ctx.Value(RequestMetadataCtxKey{})
 	if value != nil {
-		if requestMetadata, ok := value.(RequestMetadata); ok {
+		if requestMetadata, ok := value.(*RequestMetadata); ok {
 			return requestMetadata.accessToken, nil
 		}
 	}

server/midddleware/request_metadata_test.go

@@ -26,7 +26,7 @@ func TestRequestMetadata(t *testing.T) {
 
 	t.Run("extraction of namespace name", func(t *testing.T) {
 		ctx := context.TODO()
-		ctx = context.WithValue(ctx, &RequestMetadataCtxKey{}, RequestMetadata{
+		ctx = context.WithValue(ctx, RequestMetadataCtxKey{}, &RequestMetadata{
 			accessToken: &AccessToken{
 				Namespace: "test-namespace-1",
 				Sub:       "test@tigrisdata.com",
@@ -41,7 +41,7 @@ func TestRequestMetadata(t *testing.T) {
 
 	t.Run("extraction of token", func(t *testing.T) {
 		ctx := context.TODO()
-		ctx = context.WithValue(ctx, &RequestMetadataCtxKey{}, RequestMetadata{
+		ctx = context.WithValue(ctx, RequestMetadataCtxKey{}, &RequestMetadata{
 			accessToken: &AccessToken{
 				Namespace: "test-namespace-1",
 				Sub:       "test@tigrisdata.com",

server/services/v1/sessions.go

@@ -78,10 +78,13 @@ func (sessMgr *SessionManager) Create(ctx context.Context, reloadVerOutside bool
 		tenant, err = sessMgr.tenantMgr.CreateOrGetTenant(ctx, sessMgr.txMgr, metadata.NewDefaultNamespace())
 	} else {
 		// this call will validate if namespace is not already present
-		namespace := sessMgr.tenantMgr.GetNamespace(namespaceForThisSession)
+		namespace, err := sessMgr.tenantMgr.GetNamespace(ctx, namespaceForThisSession, sessMgr.txMgr)
 		if namespace == nil {
 			return nil, api.Errorf(api.Code_NOT_FOUND, "Namespace not found %s", namespaceForThisSession)
 		}
+		if err != nil {
+			return nil, err
+		}
 		tenant, err = sessMgr.tenantMgr.CreateOrGetTenant(ctx, sessMgr.txMgr, namespace)
 		if err != nil {
 			return nil, api.Errorf(api.Code_INTERNAL, "Could not create or get tenant from the input namespace")