Merge pull request #11673 from CesiumGS/update-requestscheduler-limit

Increase default `RequestsScheduler.maximumRequestsPerServer`
CesiumGS · Dec 5, 2023 · e8a4ee1 · e8a4ee1
2 parents d20db54 + e1b5760
commit e8a4ee1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,11 +1,12 @@
 # Change Log
 
-### 1.113
+### 1.113 - 2024-01-02
 
 #### @cesium/engine
 
 ##### Fixes :wrench:
 
+- Changes the default `RequestScheduler.maximumRequestsPerServer` from 6 to 18. This should improve performance on HTTP/2 servers and above [#11627](https://github.com/CesiumGS/cesium/issues/11627)
 - Corrected JSDoc and Typescript definitions that marked optional arguments as required in `ImageryProvider` constructor [#11625](https://github.com/CesiumGS/cesium/issues/11625)
 
 ### 1.112 - 2023-12-01

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -161,6 +161,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
   - [Jeshurun Hembd](https://github.com/jjhembd)
   - [Mia Tang](https://github.com/miatang13)
   - [Mark Dane](https://github.com/angrycat9000)
+  - [jjspace](https://github.com/jjspace)
 - [Northrop Grumman](http://www.northropgrumman.com)
   - [Joseph Stein](https://github.com/nahgrin)
 - [EOX IT Services GmbH](https://eox.at)

diff --git a/packages/engine/Source/Core/RequestScheduler.js b/packages/engine/Source/Core/RequestScheduler.js
@@ -60,9 +60,9 @@ RequestScheduler.maximumRequests = 50;
  * The maximum number of simultaneous active requests per server. Un-throttled requests or servers specifically
  * listed in {@link requestsByServer} do not observe this limit.
  * @type {number}
- * @default 6
+ * @default 18
  */
-RequestScheduler.maximumRequestsPerServer = 6;
+RequestScheduler.maximumRequestsPerServer = 18;
 
 /**
  * A per server key list of overrides to use for throttling instead of <code>maximumRequestsPerServer</code>.
@@ -78,13 +78,7 @@ RequestScheduler.maximumRequestsPerServer = 6;
  *   "assets.cesium.com:443": 18,
  * };
  */
-RequestScheduler.requestsByServer = {
-  "api.cesium.com:443": 18,
-  "assets.ion.cesium.com:443": 18,
-  "ibasemaps-api.arcgis.com:443": 18,
-  "tile.googleapis.com:443": 18,
-  "tile.openstreetmap.org:443": 18,
-};
+RequestScheduler.requestsByServer = {};
 
 /**
  * Specifies if the request scheduler should throttle incoming requests, or let the browser queue requests under its control.

diff --git a/packages/engine/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js b/packages/engine/Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js
@@ -314,7 +314,11 @@ describe("Core/GoogleEarthEnterpriseTerrainProvider", function () {
       const promises = [];
       return pollToPromise(function () {
         let b = true;
-        for (let i = 0; i < 10; ++i) {
+        for (
+          let i = 0;
+          i < RequestScheduler.maximumRequestsPerServer + 2;
+          ++i
+        ) {
           b = b && terrainProvider.getTileDataAvailable(i, i, i);
         }
         return b && terrainProvider.getTileDataAvailable(1, 2, 3);