innodb_zip.* and innodb.innodb-16k tests are failing on s390x arch with the following error message:
ER_TOO_BIG_ROWSIZE (1118): Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
|
I am attaching the full log of the tests.
{"report":{"fcp":1295.2999999523163,"ttfb":393.2000000476837,"pageVisibility":"visible","entityId":107202,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":0.5,"journeyId":"cba0dad4-837f-43b4-b7af-8360b9bbb4aa","navigationType":0,"readyForUser":1375.2999999523163,"redirectCount":0,"resourceLoadedEnd":1540.1000000238419,"resourceLoadedStart":399.2999999523163,"resourceTiming":[{"duration":401.2000000476837,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2bu7/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":399.2999999523163,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":399.2999999523163,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":800.5,"responseStart":0,"secureConnectionStart":0},{"duration":401.2999999523163,"initiatorType":"link","name":"https://jira.mariadb.org/s/7ebd35e77e471bc30ff0eba799ebc151-CDN/lu2bu7/820016/12ta74/8679b4946efa1a0bb029a3a22206fb5d/_/download/contextbatch/css/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.css?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true","startTime":399.60000002384186,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":399.60000002384186,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":800.8999999761581,"responseStart":0,"secureConnectionStart":0},{"duration":442.10000002384186,"initiatorType":"script","name":"https://jira.mariadb.org/s/fbf975c0cce4b1abf04784eeae9ba1f4-CDN/lu2bu7/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":399.7999999523163,"connectEnd":399.7999999523163,"connectStart":399.7999999523163,"domainLookupEnd":399.7999999523163,"domainLookupStart":399.7999999523163,"fetchStart":399.7999999523163,"redirectEnd":0,"redirectStart":0,"requestStart":399.7999999523163,"responseEnd":841.8999999761581,"responseStart":841.8999999761581,"secureConnectionStart":399.7999999523163},{"duration":505.2000000476837,"initiatorType":"script","name":"https://jira.mariadb.org/s/099b33461394b8015fc36c0a4b96e19f-CDN/lu2bu7/820016/12ta74/8679b4946efa1a0bb029a3a22206fb5d/_/download/contextbatch/js/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.js?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&locale=en&slack-enabled=true","startTime":399.89999997615814,"connectEnd":399.89999997615814,"connectStart":399.89999997615814,"domainLookupEnd":399.89999997615814,"domainLookupStart":399.89999997615814,"fetchStart":399.89999997615814,"redirectEnd":0,"redirectStart":0,"requestStart":399.89999997615814,"responseEnd":905.1000000238419,"responseStart":905.1000000238419,"secureConnectionStart":399.89999997615814},{"duration":508.59999990463257,"initiatorType":"script","name":"https://jira.mariadb.org/s/94c15bff32baef80f4096a08aceae8bc-CDN/lu2bu7/820016/12ta74/c92c0caa9a024ae85b0ebdbed7fb4bd7/_/download/contextbatch/js/atl.global,-_super/batch.js?locale=en","startTime":400.2000000476837,"connectEnd":400.2000000476837,"connectStart":400.2000000476837,"domainLookupEnd":400.2000000476837,"domainLookupStart":400.2000000476837,"fetchStart":400.2000000476837,"redirectEnd":0,"redirectStart":0,"requestStart":400.2000000476837,"responseEnd":908.7999999523163,"responseStart":908.7999999523163,"secureConnectionStart":400.2000000476837},{"duration":508.7000000476837,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-en/jira.webresources:calendar-en.js","startTime":400.39999997615814,"connectEnd":400.39999997615814,"connectStart":400.39999997615814,"domainLookupEnd":400.39999997615814,"domainLookupStart":400.39999997615814,"fetchStart":400.39999997615814,"redirectEnd":0,"redirectStart":0,"requestStart":400.39999997615814,"responseEnd":909.1000000238419,"responseStart":909.1000000238419,"secureConnectionStart":400.39999997615814},{"duration":509,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-localisation-moment/jira.webresources:calendar-localisation-moment.js","startTime":400.5,"connectEnd":400.5,"connectStart":400.5,"domainLookupEnd":400.5,"domainLookupStart":400.5,"fetchStart":400.5,"redirectEnd":0,"redirectStart":0,"requestStart":400.5,"responseEnd":909.5,"responseStart":909.5,"secureConnectionStart":400.5},{"duration":583.5999999046326,"initiatorType":"link","name":"https://jira.mariadb.org/s/b04b06a02d1959df322d9cded3aeecc1-CDN/lu2bu7/820016/12ta74/a2ff6aa845ffc9a1d22fe23d9ee791fc/_/download/contextbatch/css/jira.global.look-and-feel,-_super/batch.css","startTime":400.7000000476837,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":400.7000000476837,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":984.2999999523163,"responseStart":0,"secureConnectionStart":0},{"duration":509,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":400.89999997615814,"connectEnd":400.89999997615814,"connectStart":400.89999997615814,"domainLookupEnd":400.89999997615814,"domainLookupStart":400.89999997615814,"fetchStart":400.89999997615814,"redirectEnd":0,"redirectStart":0,"requestStart":400.89999997615814,"responseEnd":909.8999999761581,"responseStart":909.8999999761581,"secureConnectionStart":400.89999997615814},{"duration":583.3999999761581,"initiatorType":"link","name":"https://jira.mariadb.org/s/3ac36323ba5e4eb0af2aa7ac7211b4bb-CDN/lu2bu7/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/css/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.css?jira.create.linked.issue=true","startTime":401.10000002384186,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":401.10000002384186,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":984.5,"responseStart":0,"secureConnectionStart":0},{"duration":509.2999999523163,"initiatorType":"script","name":"https://jira.mariadb.org/s/3339d87fa2538a859872f2df449bf8d0-CDN/lu2bu7/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/js/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.js?jira.create.linked.issue=true&locale=en","startTime":401.2000000476837,"connectEnd":401.2000000476837,"connectStart":401.2000000476837,"domainLookupEnd":401.2000000476837,"domainLookupStart":401.2000000476837,"fetchStart":401.2000000476837,"redirectEnd":0,"redirectStart":0,"requestStart":401.2000000476837,"responseEnd":910.5,"responseStart":910.5,"secureConnectionStart":401.2000000476837},{"duration":786.6000000238419,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-js/jira.webresources:bigpipe-js.js","startTime":402.10000002384186,"connectEnd":402.10000002384186,"connectStart":402.10000002384186,"domainLookupEnd":402.10000002384186,"domainLookupStart":402.10000002384186,"fetchStart":402.10000002384186,"redirectEnd":0,"redirectStart":0,"requestStart":402.10000002384186,"responseEnd":1188.7000000476837,"responseStart":1188.7000000476837,"secureConnectionStart":402.10000002384186},{"duration":1127.2000000476837,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-init/jira.webresources:bigpipe-init.js","startTime":402.2999999523163,"connectEnd":402.2999999523163,"connectStart":402.2999999523163,"domainLookupEnd":402.2999999523163,"domainLookupStart":402.2999999523163,"fetchStart":402.2999999523163,"redirectEnd":0,"redirectStart":0,"requestStart":402.2999999523163,"responseEnd":1529.5,"responseStart":1529.5,"secureConnectionStart":402.2999999523163},{"duration":202.5,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":995.2000000476837,"connectEnd":995.2000000476837,"connectStart":995.2000000476837,"domainLookupEnd":995.2000000476837,"domainLookupStart":995.2000000476837,"fetchStart":995.2000000476837,"redirectEnd":0,"redirectStart":0,"requestStart":995.2000000476837,"responseEnd":1197.7000000476837,"responseStart":1197.7000000476837,"secureConnectionStart":995.2000000476837},{"duration":279.89999997615814,"initiatorType":"link","name":"https://jira.mariadb.org/s/d5715adaadd168a9002b108b2b039b50-CDN/lu2bu7/820016/12ta74/be4b45e9cec53099498fa61c8b7acba4/_/download/contextbatch/css/jira.project.sidebar,-_super,-project.issue.navigator,-jira.general,-jira.browse.project,-jira.view.issue,-jira.global,-atl.general,-com.atlassian.jira.projects.sidebar.init/batch.css?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true","startTime":1250.6000000238419,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":1250.6000000238419,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1530.5,"responseStart":0,"secureConnectionStart":0},{"duration":281.2999999523163,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/e65b778d185daf5aee24936755b43da6/_/download/contextbatch/js/browser-metrics-plugin.contrib,-_super,-project.issue.navigator,-jira.view.issue,-atl.general/batch.js?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true","startTime":1251.6000000238419,"connectEnd":1251.6000000238419,"connectStart":1251.6000000238419,"domainLookupEnd":1251.6000000238419,"domainLookupStart":1251.6000000238419,"fetchStart":1251.6000000238419,"redirectEnd":0,"redirectStart":0,"requestStart":1251.6000000238419,"responseEnd":1532.8999999761581,"responseStart":1532.8999999761581,"secureConnectionStart":1251.6000000238419},{"duration":288.10000002384186,"initiatorType":"script","name":"https://jira.mariadb.org/s/f51ef5507eea4c158f257c66c93b2a3f-CDN/lu2bu7/820016/12ta74/be4b45e9cec53099498fa61c8b7acba4/_/download/contextbatch/js/jira.project.sidebar,-_super,-project.issue.navigator,-jira.general,-jira.browse.project,-jira.view.issue,-jira.global,-atl.general,-com.atlassian.jira.projects.sidebar.init/batch.js?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&locale=en&slack-enabled=true","startTime":1252,"connectEnd":1252,"connectStart":1252,"domainLookupEnd":1252,"domainLookupStart":1252,"fetchStart":1252,"redirectEnd":0,"redirectStart":0,"requestStart":1252,"responseEnd":1540.1000000238419,"responseStart":1540.1000000238419,"secureConnectionStart":1252},{"duration":275.60000002384186,"initiatorType":"script","name":"https://www.google-analytics.com/analytics.js","startTime":1289.3999999761581,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":1289.3999999761581,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1565,"responseStart":0,"secureConnectionStart":0}],"fetchStart":0,"domainLookupStart":0,"domainLookupEnd":0,"connectStart":0,"connectEnd":0,"requestStart":204,"responseStart":393,"responseEnd":396,"domLoading":396,"domInteractive":1566,"domContentLoadedEventStart":1566,"domContentLoadedEventEnd":1611,"domComplete":2162,"loadEventStart":2162,"loadEventEnd":2163,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":1531.2999999523163},{"name":"bigPipe.sidebar-id.end","time":1532.1000000238419},{"name":"bigPipe.activity-panel-pipe-id.start","time":1532.2999999523163},{"name":"bigPipe.activity-panel-pipe-id.end","time":1535.3999999761581},{"name":"activityTabFullyLoaded","time":1628.3999999761581}],"measures":[],"correlationId":"d482ca8ae1ff1b","effectiveType":"4g","downlink":10,"rtt":0,"serverDuration":130,"dbReadsTimeInMs":23,"dbConnsTimeInMs":33,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}
I applied the following patch to simulate the patched s390x compressBound() in any cmake -DWITH_ZLIB=bundled build:
diff --git a/zlib/compress.c b/zlib/compress.c
index e2db404abf8..ab232aaaef6 100644
--- a/zlib/compress.c
+++ b/zlib/compress.c
@@ -81,6 +81,28 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
uLong ZEXPORT compressBound (sourceLen)
uLong sourceLen;
{
- return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
- (sourceLen >> 25) + 13;
+
+#define DFLTCC_BLOCK_HEADER_BITS 3
+#define DFLTCC_HLITS_COUNT_BITS 5
+#define DFLTCC_HDISTS_COUNT_BITS 5
+#define DFLTCC_HCLENS_COUNT_BITS 4
+#define DFLTCC_MAX_HCLENS 19
+#define DFLTCC_HCLEN_BITS 3
+#define DFLTCC_MAX_HLITS 286
+#define DFLTCC_MAX_HDISTS 30
+#define DFLTCC_MAX_HLIT_HDIST_BITS 7
+#define DFLTCC_MAX_SYMBOL_BITS 16
+#define DFLTCC_MAX_EOBS_BITS 15
+#define DFLTCC_MAX_PADDING_BITS 7
+#define DEFLATE_BOUND_COMPLEN(source_len) \
+ ((DFLTCC_BLOCK_HEADER_BITS + \
+ DFLTCC_HLITS_COUNT_BITS + \
+ DFLTCC_HDISTS_COUNT_BITS + \
+ DFLTCC_HCLENS_COUNT_BITS + \
+ DFLTCC_MAX_HCLENS * DFLTCC_HCLEN_BITS + \
+ (DFLTCC_MAX_HLITS + DFLTCC_MAX_HDISTS) * DFLTCC_MAX_HLIT_HDIST_BITS + \
+ (source_len) * DFLTCC_MAX_SYMBOL_BITS + \
+ DFLTCC_MAX_EOBS_BITS + \
+ DFLTCC_MAX_PADDING_BITS) >> 3)
+ return DEFLATE_BOUND_COMPLEN(sourceLen) + 6;
In the server error log I see the following:
10.5 52b32c60c26b512ccf9b1233d7f54c4b56499df3
2022-02-16 11:40:24 0 [Note] InnoDB: Compressed tables use zlib 1.2.11
In most failed tests, a CREATE TABLE statement fails with ER_TOO_BIG_ROWSIZE (1118). In innodb_zip.wl6347_comp_indx_stat, the observed data file sizes are larger. For the test innodb_zip.bug36169, a debug assertion (which is only enabled in debug builds) fails:
10.5 52b32c60c26b512ccf9b1233d7f54c4b56499df3
mariadbd: /mariadb/10.5m/storage/innobase/handler/ha_innodb.cc:12905: bool create_table_info_t::row_size_is_acceptable(const dict_index_t&, bool) const: Assertion `info.max_leaf_size != 0' failed.
The full list of test failures is as follows:
Completed: Failed 28/5574 tests, 99.50% were successful.
Failing test(s): innodb.innodb-16k innodb_zip.page_size innodb_zip.index_large_prefix innodb_zip.prefix_index_liftedlimit innodb_zip.wl6347_comp_indx_stat innodb_zip.bug36172 innodb_zip.bug52745 innodb_zip.wl6344_compress_level innodb_zip.bug36169
I will try to tweak all these tests so that they will pass with the normal compressBound() as well the weaker compressBound() guarantee that is associated with the s390x DFLTCC instruction.