Merge pull request opendatahub-io#2334 from lucferbux/rhoaieng-549

Fix performance issues in Model Serving Global
red-hat-data-services · Jan 19, 2024 · 2dd7f08 · 2dd7f08
2 parents 06674c3 + 2522c0f
commit 2dd7f08
Show file tree

Hide file tree

Showing 8 changed files with 156 additions and 16 deletions.
diff --git a/frontend/src/__tests__/cypress/cypress/e2e/modelServing/ModelServingGlobal.cy.ts b/frontend/src/__tests__/cypress/cypress/e2e/modelServing/ModelServingGlobal.cy.ts
@@ -27,6 +27,7 @@ type HandlersProps = {
   projectEnableModelMesh?: boolean;
   servingRuntimes?: ServingRuntimeKind[];
   inferenceServices?: InferenceServiceKind[];
+  delayInferenceServices?: boolean;
 };
 
 const initIntercepts = ({
@@ -35,6 +36,7 @@ const initIntercepts = ({
   projectEnableModelMesh,
   servingRuntimes = [mockServingRuntimeK8sResource({})],
   inferenceServices = [mockInferenceServiceK8sResource({})],
+  delayInferenceServices,
 }: HandlersProps) => {
   cy.intercept(
     '/api/dsc/status',
@@ -78,13 +80,30 @@ const initIntercepts = ({
     },
     mockK8sResourceList(servingRuntimes),
   );
+  cy.intercept(
+    {
+      method: 'GET',
+      pathname: '/api/k8s/apis/serving.kserve.io/v1alpha1/servingruntimes',
+    },
+    mockK8sResourceList(servingRuntimes),
+  );
   cy.intercept(
     {
       method: 'GET',
       pathname: '/api/k8s/apis/serving.kserve.io/v1beta1/namespaces/modelServing/inferenceservices',
     },
     mockK8sResourceList(inferenceServices),
   );
+  cy.intercept(
+    {
+      method: 'GET',
+      pathname: '/api/k8s/apis/serving.kserve.io/v1beta1/inferenceservices',
+    },
+    {
+      delay: delayInferenceServices ? 1000 : 0,
+      body: mockK8sResourceList(inferenceServices),
+    },
+  );
   cy.intercept(
     {
       method: 'POST',
@@ -205,6 +224,17 @@ describe('Model Serving Global', () => {
     inferenceServiceModal.findSubmitButton().should('be.disabled');
   });
 
+  it('All projects loading', () => {
+    initIntercepts({ delayInferenceServices: true, servingRuntimes: [], inferenceServices: [] });
+
+    // Visit the all-projects view (no project name passed here)
+    modelServingGlobal.visit();
+
+    modelServingGlobal.shouldWaitAndCancel();
+
+    modelServingGlobal.shouldBeEmpty();
+  });
+
   it('Empty State No Project Selected', () => {
     initIntercepts({ inferenceServices: [] });
 

diff --git a/frontend/src/__tests__/cypress/cypress/pages/modelServing.ts b/frontend/src/__tests__/cypress/cypress/pages/modelServing.ts
@@ -24,6 +24,17 @@ class ModelServingGlobal {
     return this;
   }
 
+  shouldWaitAndCancel() {
+    cy.findAllByText(
+      'Retrieving model data from all projects in the cluster. This can take a few minutes.',
+    );
+    this.findCancelButton().click();
+  }
+
+  findCancelButton() {
+    return cy.findByRole('button', { name: 'Cancel' });
+  }
+
   findDeployModelButton() {
     return cy.findByRole('button', { name: 'Deploy model' });
   }

diff --git a/frontend/src/pages/ApplicationsPage.tsx b/frontend/src/pages/ApplicationsPage.tsx
@@ -32,6 +32,7 @@ type ApplicationsPageProps = {
   headerAction?: React.ReactNode;
   headerContent?: React.ReactNode;
   provideChildrenPadding?: boolean;
+  loadingContent?: React.ReactNode;
 };
 
 const ApplicationsPage: React.FC<ApplicationsPageProps> = ({
@@ -48,6 +49,7 @@ const ApplicationsPage: React.FC<ApplicationsPageProps> = ({
   headerAction,
   headerContent,
   provideChildrenPadding,
+  loadingContent,
 }) => {
   const renderHeader = () => (
     <PageSection variant={PageSectionVariants.light}>
@@ -88,12 +90,14 @@ const ApplicationsPage: React.FC<ApplicationsPageProps> = ({
 
     if (!loaded) {
       return (
-        <PageSection isFilled>
-          <EmptyState variant={EmptyStateVariant.lg} data-id="loading-empty-state">
-            <Spinner size="xl" />
-            <EmptyStateHeader titleText="Loading" headingLevel="h1" />
-          </EmptyState>
-        </PageSection>
+        loadingContent || (
+          <PageSection isFilled>
+            <EmptyState variant={EmptyStateVariant.lg} data-id="loading-empty-state">
+              <Spinner size="xl" />
+              <EmptyStateHeader titleText="Loading" headingLevel="h1" />
+            </EmptyState>
+          </PageSection>
+        )
       );
     }
 

diff --git a/frontend/src/pages/modelServing/ModelServingContext.tsx b/frontend/src/pages/modelServing/ModelServingContext.tsx
@@ -36,6 +36,8 @@ type ModelServingContextType = {
   servingRuntimes: ContextResourceData<ServingRuntimeKind>;
   inferenceServices: ContextResourceData<InferenceServiceKind>;
   project: ProjectKind | null;
+  preferredProject: ProjectKind | null;
+  projects: ProjectKind[] | null;
 };
 
 type ModelServingContextProviderProps = {
@@ -52,6 +54,8 @@ export const ModelServingContext = React.createContext<ModelServingContextType>(
   servingRuntimes: DEFAULT_CONTEXT_DATA,
   inferenceServices: DEFAULT_CONTEXT_DATA,
   project: null,
+  preferredProject: null,
+  projects: null,
 });
 
 const ModelServingContextProvider = conditionalArea<ModelServingContextProviderProps>(
@@ -60,7 +64,7 @@ const ModelServingContextProvider = conditionalArea<ModelServingContextProviderP
 )(({ children, namespace }) => {
   const { dashboardNamespace } = useDashboardNamespace();
   const navigate = useNavigate();
-  const { projects } = React.useContext(ProjectsContext);
+  const { projects, preferredProject } = React.useContext(ProjectsContext);
   const project = projects.find(byName(namespace)) ?? null;
   useSyncPreferredProject(project);
   const servingRuntimeTemplates = useContextResourceData<TemplateKind>(
@@ -144,6 +148,8 @@ const ModelServingContextProvider = conditionalArea<ModelServingContextProviderP
         dataConnections,
         refreshAllData,
         project,
+        preferredProject,
+        projects,
       }}
     >
       {children}

diff --git a/frontend/src/pages/modelServing/screens/global/ModelServingGlobal.tsx b/frontend/src/pages/modelServing/screens/global/ModelServingGlobal.tsx
@@ -1,19 +1,25 @@
 import React from 'react';
+import { useNavigate } from 'react-router';
 import ApplicationsPage from '~/pages/ApplicationsPage';
 import { ModelServingContext } from '~/pages/modelServing/ModelServingContext';
 import useServingPlatformStatuses from '~/pages/modelServing/useServingPlatformStatuses';
 import { getProjectModelServingPlatform } from '~/pages/modelServing/screens/projects/utils';
 import EmptyModelServing from './EmptyModelServing';
 import InferenceServiceListView from './InferenceServiceListView';
 import ModelServingProjectSelection from './ModelServingProjectSelection';
+import ModelServingLoading from './ModelServingLoading';
 
 const ModelServingGlobal: React.FC = () => {
   const {
     servingRuntimes: { data: servingRuntimes, loaded: servingRuntimesLoaded },
     inferenceServices: { data: inferenceServices, loaded: inferenceServicesLoaded },
     project: currentProject,
+    preferredProject,
+    projects,
   } = React.useContext(ModelServingContext);
 
+  const navigate = useNavigate();
+
   const servingPlatformStatuses = useServingPlatformStatuses();
   const { error: notInstalledError } = getProjectModelServingPlatform(
     currentProject,
@@ -34,6 +40,20 @@ const ModelServingGlobal: React.FC = () => {
         />
       }
       provideChildrenPadding
+      loadingContent={
+        currentProject ? undefined : (
+          <ModelServingLoading
+            title="Loading"
+            description="Retrieving model data from all projects in the cluster. This can take a few minutes."
+            onCancel={() => {
+              const redirectProject = preferredProject ?? projects?.[0];
+              if (redirectProject) {
+                navigate(`/modelServing/${redirectProject?.metadata.name}`);
+              }
+            }}
+          />
+        )
+      }
     >
       <InferenceServiceListView
         inferenceServices={inferenceServices}

diff --git a/frontend/src/pages/modelServing/screens/global/ModelServingLoading.tsx b/frontend/src/pages/modelServing/screens/global/ModelServingLoading.tsx
@@ -0,0 +1,41 @@
+import {
+  Button,
+  EmptyState,
+  EmptyStateActions,
+  EmptyStateBody,
+  EmptyStateFooter,
+  EmptyStateHeader,
+  EmptyStateVariant,
+  PageSection,
+  Spinner,
+} from '@patternfly/react-core';
+import React from 'react';
+
+type ModelServingLoadingProps = {
+  title: string;
+  description: string;
+  onCancel: () => void;
+};
+
+const ModelServingLoading: React.FC<ModelServingLoadingProps> = ({
+  title,
+  description,
+  onCancel,
+}) => (
+  <PageSection isFilled>
+    <EmptyState variant={EmptyStateVariant.lg} data-id="loading-empty-state">
+      <Spinner size="xl" />
+      <EmptyStateHeader titleText={title} headingLevel="h1" />
+      <EmptyStateBody>{description}</EmptyStateBody>
+      <EmptyStateFooter>
+        <EmptyStateActions>
+          <Button variant="primary" onClick={onCancel}>
+            Cancel
+          </Button>
+        </EmptyStateActions>
+      </EmptyStateFooter>
+    </EmptyState>
+  </PageSection>
+);
+
+export default ModelServingLoading;
diff --git a/frontend/src/pages/modelServing/useInferenceServices.ts b/frontend/src/pages/modelServing/useInferenceServices.ts
@@ -1,20 +1,36 @@
 import * as React from 'react';
-import { getInferenceServiceContext } from '~/api';
-import { InferenceServiceKind } from '~/k8sTypes';
+import { getInferenceServiceContext, listInferenceService, useAccessReview } from '~/api';
+import { AccessReviewResourceAttributes, InferenceServiceKind } from '~/k8sTypes';
 import useFetchState, { FetchState, NotReadyError } from '~/utilities/useFetchState';
 import useModelServingEnabled from '~/pages/modelServing/useModelServingEnabled';
 import { LABEL_SELECTOR_DASHBOARD_RESOURCE } from '~/const';
 
+const accessReviewResource: AccessReviewResourceAttributes = {
+  group: 'serving.kserve.io',
+  resource: 'inferenceservices',
+  verb: 'list',
+};
+
 const useInferenceServices = (namespace?: string): FetchState<InferenceServiceKind[]> => {
   const modelServingEnabled = useModelServingEnabled();
 
+  const [allowCreate, rbacLoaded] = useAccessReview({
+    ...accessReviewResource,
+  });
+
   const getServingInferences = React.useCallback(() => {
     if (!modelServingEnabled) {
       return Promise.reject(new NotReadyError('Model serving is not enabled'));
     }
 
-    return getInferenceServiceContext(namespace, LABEL_SELECTOR_DASHBOARD_RESOURCE);
-  }, [namespace, modelServingEnabled]);
+    if (!rbacLoaded) {
+      return Promise.reject(new NotReadyError('Fetch is not ready'));
+    }
+
+    const getInferenceServices = allowCreate ? listInferenceService : getInferenceServiceContext;
+
+    return getInferenceServices(namespace, LABEL_SELECTOR_DASHBOARD_RESOURCE);
+  }, [namespace, modelServingEnabled, rbacLoaded, allowCreate]);
 
   return useFetchState<InferenceServiceKind[]>(getServingInferences, [], {
     initialPromisePurity: true,

diff --git a/frontend/src/pages/modelServing/useServingRuntimes.ts b/frontend/src/pages/modelServing/useServingRuntimes.ts
@@ -1,32 +1,44 @@
 import * as React from 'react';
-import { getServingRuntimeContext } from '~/api';
-import { ServingRuntimeKind } from '~/k8sTypes';
+import { getServingRuntimeContext, listServingRuntimes, useAccessReview } from '~/api';
+import { AccessReviewResourceAttributes, ServingRuntimeKind } from '~/k8sTypes';
 import useModelServingEnabled from '~/pages/modelServing/useModelServingEnabled';
 import useFetchState, { FetchState, NotReadyError } from '~/utilities/useFetchState';
 import { LABEL_SELECTOR_DASHBOARD_RESOURCE } from '~/const';
 
+const accessReviewResource: AccessReviewResourceAttributes = {
+  group: 'serving.kserve.io',
+  resource: 'servingruntimes',
+  verb: 'list',
+};
+
 const useServingRuntimes = (
   namespace?: string,
   notReady?: boolean,
 ): FetchState<ServingRuntimeKind[]> => {
   const modelServingEnabled = useModelServingEnabled();
 
+  const [allowCreate, rbacLoaded] = useAccessReview({
+    ...accessReviewResource,
+  });
+
   const getServingRuntimes = React.useCallback(() => {
     if (!modelServingEnabled) {
       return Promise.reject(new NotReadyError('Model serving is not enabled'));
     }
 
-    if (notReady) {
+    if (notReady || !rbacLoaded) {
       return Promise.reject(new NotReadyError('Fetch is not ready'));
     }
 
-    return getServingRuntimeContext(namespace, LABEL_SELECTOR_DASHBOARD_RESOURCE).catch((e) => {
+    const getServingRuntimes = allowCreate ? listServingRuntimes : getServingRuntimeContext;
+
+    return getServingRuntimes(namespace, LABEL_SELECTOR_DASHBOARD_RESOURCE).catch((e) => {
       if (e.statusObject?.code === 404) {
         throw new Error('Model serving is not properly configured.');
       }
       throw e;
     });
-  }, [namespace, modelServingEnabled, notReady]);
+  }, [namespace, modelServingEnabled, notReady, rbacLoaded, allowCreate]);
 
   return useFetchState<ServingRuntimeKind[]>(getServingRuntimes, [], {
     initialPromisePurity: true,