Optimize saved objects getScopedClient and HTTP API (#68221) (#68461)

* Create a single repository to be shared by all calls to getScopedClient * Cache migrator.getActiveMappings to improve createRepository * Use typeregistry.getAllTypes instead of getRootPropertiesObjects(mappings) * Don't validate plugin's config every time it's read * Fix saved_objects_mixin Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Jun 8, 2020 · af07d65 · af07d65
1 parent a2e0a7e
commit af07d65
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { map } from 'rxjs/operators';
+import { map, shareReplay } from 'rxjs/operators';
 import { combineLatest } from 'rxjs';
 import { CoreContext } from '../core_context';
 import { PluginWrapper } from './plugin';
@@ -107,8 +107,8 @@ export function createPluginInitializerContext(
        * @param ConfigClass A class (not an instance of a class) that contains a
        * static `schema` that we validate the config at the given `path` against.
        */
-      create() {
-        return coreContext.configService.atPath(pluginManifest.configPath);
+      create<T>() {
+        return coreContext.configService.atPath<T>(pluginManifest.configPath).pipe(shareReplay(1));
       },
       createIfExists() {
         return coreContext.configService.optionalAtPath(pluginManifest.configPath);

diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
@@ -74,6 +74,7 @@ export class KibanaMigrator {
   private readonly status$ = new BehaviorSubject<KibanaMigratorStatus>({
     status: 'waiting',
   });
+  private readonly activeMappings: IndexMapping;
 
   /**
    * Creates an instance of KibanaMigrator.
@@ -100,6 +101,9 @@ export class KibanaMigrator {
       validateDoc: docValidator(savedObjectValidations || {}),
       log: this.log,
     });
+    // Building the active mappings (and associated md5sums) is an expensive
+    // operation so we cache the result
+    this.activeMappings = buildActiveMappings(this.mappingProperties);
   }
 
   /**
@@ -172,7 +176,7 @@ export class KibanaMigrator {
    *
    */
   public getActiveMappings(): IndexMapping {
-    return buildActiveMappings(this.mappingProperties);
+    return this.activeMappings;
   }
 
   /**

diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
@@ -135,7 +135,7 @@ export class SavedObjectsRepository {
     injectedConstructor: any = SavedObjectsRepository
   ): ISavedObjectsRepository {
     const mappings = migrator.getActiveMappings();
-    const allTypes = Object.keys(getRootPropertiesObjects(mappings));
+    const allTypes = typeRegistry.getAllTypes().map((t) => t.name);
     const serializer = new SavedObjectsSerializer(typeRegistry);
     const visibleTypes = allTypes.filter((type) => !typeRegistry.isHidden(type));
 

diff --git a/src/legacy/server/saved_objects/saved_objects_mixin.js b/src/legacy/server/saved_objects/saved_objects_mixin.js
@@ -27,14 +27,13 @@ import {
   importSavedObjectsFromStream,
   resolveSavedObjectsImportErrors,
 } from '../../../core/server/saved_objects';
-import { getRootPropertiesObjects } from '../../../core/server/saved_objects/mappings';
 import { convertTypesToLegacySchema } from '../../../core/server/saved_objects/utils';
 
 export function savedObjectsMixin(kbnServer, server) {
   const migrator = kbnServer.newPlatform.__internals.kibanaMigrator;
   const typeRegistry = kbnServer.newPlatform.start.core.savedObjects.getTypeRegistry();
   const mappings = migrator.getActiveMappings();
-  const allTypes = Object.keys(getRootPropertiesObjects(mappings));
+  const allTypes = typeRegistry.getAllTypes().map((t) => t.name);
   const schema = new SavedObjectsSchema(convertTypesToLegacySchema(typeRegistry.getAllTypes()));
   const visibleTypes = allTypes.filter((type) => !schema.isHiddenType(type));
 

diff --git a/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts b/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
@@ -68,14 +68,18 @@ export class SpacesService {
       return spaceId;
     };
 
+    const internalRepositoryPromise = getStartServices().then(([coreStart]) =>
+      coreStart.savedObjects.createInternalRepository(['space'])
+    );
+
     const getScopedClient = async (request: KibanaRequest) => {
       const [coreStart] = await getStartServices();
+      const internalRepository = await internalRepositoryPromise;
 
       return config$
         .pipe(
+          take(1),
           map((config) => {
-            const internalRepository = coreStart.savedObjects.createInternalRepository(['space']);
-
             const callWithRequestRepository = coreStart.savedObjects.createScopedRepository(
               request,
               ['space']
@@ -92,8 +96,7 @@ export class SpacesService {
               internalRepository,
               request
             );
-          }),
-          take(1)
+          })
         )
         .toPromise();
     };