Zowe Suite v2.17.0

zowe · Jul 2, 2024 · 61d0634 · 61d0634
2 parents 83f70e8 + b1e08d7
commit 61d0634
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to the ZSS package will be documented in this file.
 
+## `2.17.0`
+- Code to configure the SLH block size of the http server through 'httpRequestHeapMaxBlocks' in the yaml.(#701)
+
 ## `2.16.0`
 - Bugfix: AUX should take leap seconds into account in their log messages' timestamp (#690, #691)
 

diff --git a/bin/configure.sh b/bin/configure.sh
@@ -25,6 +25,6 @@ if [ -n "${ZWE_components_zss_pluginsDir}" ]; then
 fi
 
 if [ "${ZWE_components_app_server_enabled}" != "true" ]; then
-  _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/components/zss/bin/plugins-init.js"  
+  _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/components/zss/bin/plugins-init.js"  
 fi
 
diff --git a/build/zis.proj.env b/build/zis.proj.env
@@ -1,4 +1,4 @@
 PROJECT="zis"
-VERSION=2.16.0
-DYNLINK_PLUGIN_VERSION=9
+VERSION=2.17.0
+DYNLINK_PLUGIN_VERSION=10
 DEPS=""
diff --git a/build/zss.proj.env b/build/zss.proj.env
@@ -1,5 +1,5 @@
 PROJECT="zss"
-VERSION=2.16.0
+VERSION=2.17.0
 DEPS="QUICKJS LIBYAML"
 
 QUICKJS="quickjs"

diff --git a/c/zss.c b/c/zss.c
@@ -355,6 +355,27 @@ static void setPrivilegedServerName(HttpServer *server, JsonObject *mvdSettings,
 }
 #endif /* __ZOWE_OS_ZOS */
 
+static void setHttpRequestHeapMaxBlocks(HttpServer *server, ConfigManager *configmgr){
+
+  int maxBlocks = 0;
+  int getStatus = cfgGetIntC(configmgr,ZSS_CFGNAME,&maxBlocks,3,"components","zss","httpHeapMaxBlocks");
+
+  if (getStatus == ZCFG_SUCCESS){
+    if (maxBlocks > HTTP_REQUEST_HEAP_MAX_BLOCKS){
+      zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_INFO, "httpHeapMaxBlocks out of range, max value is %d\n",HTTP_REQUEST_HEAP_MAX_BLOCKS); 
+      maxBlocks = HTTP_REQUEST_HEAP_MAX_BLOCKS;
+     } else if (maxBlocks < HTTP_REQUEST_HEAP_MIN_BLOCKS){
+      zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_INFO, "httpHeapMaxBlocks out of range, min value is %d\n",HTTP_REQUEST_HEAP_MIN_BLOCKS); 
+      maxBlocks = HTTP_REQUEST_HEAP_MIN_BLOCKS;
+     }
+    zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_INFO, "httpHeapMaxBlocks should be between %d and %d\n",HTTP_REQUEST_HEAP_MIN_BLOCKS,HTTP_REQUEST_HEAP_MAX_BLOCKS);
+  } else{
+    zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_INFO, "fallback to default server settings\n");
+    maxBlocks = HTTP_REQUEST_HEAP_DEFAULT_BLOCKS;
+  }
+  server->config->httpRequestHeapMaxBlocks = (unsigned int)maxBlocks;
+}
+
 static void loadWebServerConfigV2(HttpServer *server, 
                                   ConfigManager *configmgr,
                                   hashtable *htUsers,
@@ -370,6 +391,7 @@ static void loadWebServerConfigV2(HttpServer *server,
   server->config->userTimeouts = htUsers;
   server->config->groupTimeouts = htGroups;
   server->config->defaultTimeout = defaultSessionTimeout;
+  setHttpRequestHeapMaxBlocks(server, configmgr);
   registerHttpServiceOfLastResort(server,NULL);
 #ifdef __ZOWE_OS_ZOS
   setPrivilegedServerNameV2(server, configmgr);

diff --git a/defaults.yaml b/defaults.yaml
@@ -2,7 +2,7 @@ components:
   zss:
     port: 7557
     crossMemoryServerName: ${{ ()=> { if (zowe.environments?.ZWED_privilegedServerName) { return zowe.environments.ZWED_privilegedServerName } else { if (zowe.environments?.ZWES_XMEM_SERVER_NAME) { return zowe.environments.ZWES_XMEM_SERVER_NAME } else { return "ZWESIS_STD" } } }() }}
-    tls: true
+    tls: "${{ ()=> { if (components.zss.zowe?.network?.server?.tls?.attls) { return false } else if (zowe.network?.server?.tls?.attls) { return false } else { return true } }() }}"
     productDir: ${{ zowe.runtimeDirectory }}/components/zss/defaults
     pluginsDir: ${{ zowe.workspaceDirectory }}/app-server/plugins
     instanceDir: ${{ zowe.workspaceDirectory }}/zss

diff --git a/deps/zowe-common-c b/deps/zowe-common-c
diff --git a/manifest.template.yaml b/manifest.template.yaml
@@ -3,7 +3,7 @@ name: zss
 # Component identifier. This identifier matches artifact path in Zowe Artifactory https://zowe.jfrog.io/.
 id: org.zowe.zss
 # Without the v
-version: 2.16.0
+version: 2.17.0
 # Component version is defined in gradle.properties for Gradle project
 # Human readable component name
 title: Zowe System Services (ZSS)

diff --git a/plugins/zis/README.md b/plugins/zis/README.md
@@ -114,7 +114,7 @@ Refer to that source for the full plugin sample.
 A ZIS plugin is a load module with the following characteristics:
 * AMODE 64
 * Reentrant
-* The result of call a ZIS plugin lod module is a plugin descriptor data 
+* The result of a call to a ZIS plugin load module is a plugin descriptor data 
 structure mapped by the C struct [`ZISPlugin`](https://github.com/zowe/zss/blob/82c6f2d30951d64fb1bb6487c2dde92700b91552/h/zis/plugin.h#L81-L112)
 
 ### Services
+1 −1		.github/workflows/build-configmgr.yml
+9 −0		CHANGELOG.md
+2 −2		build/configmgr.proj.env
+1 −1		build/getesm.proj.env
+1 −1		c/configmgr.c
+3 −4		c/embeddedjs.c
+3 −2		c/httpfileservice.c
+6 −1		c/httpserver.c
+41 −0		c/qjszos.c
+5 −1		c/recovery.c
+3 −1		c/yaml2json.c
+5 −0		h/httpserver.h
+1 −1		manifest.template.yaml