When Mariabackup is invoked on an instance that uses a multi-file InnoDB system tablespace, it may fail to other files of the system tablespace than the first one.
This was revealed by the MDEV-14447 test case.
The offending code is assuming that the first page of each data file is page 0. But, in multi-file system tablespaces that is not the case. It turns out that we should just rely on the metadata that already exists in memory:
diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc
|
index e0f0df72611..f6e6fe43085 100644
|
--- a/extra/mariabackup/fil_cur.cc
|
+++ b/extra/mariabackup/fil_cur.cc
|
@@ -212,24 +212,7 @@ xb_fil_cur_open(
|
|
posix_fadvise(cursor->file, 0, 0, POSIX_FADV_SEQUENTIAL);
|
|
- /* Determine the page size */
|
- ulint flags = xb_get_space_flags(cursor->file);
|
- if (flags == ULINT_UNDEFINED) {
|
- xb_fil_cur_close(cursor);
|
- return(XB_FIL_CUR_SKIP);
|
- }
|
-
|
- if (!fsp_flags_is_valid(flags, cursor->space_id)) {
|
- ulint cflags = fsp_flags_convert_from_101(flags);
|
- if (cflags == ULINT_UNDEFINED) {
|
- msg("[%02u] mariabackup: Error: Invalid "
|
- "tablespace flags: %x.\n", thread_n, uint(flags));
|
- return(XB_FIL_CUR_SKIP);
|
- }
|
- flags = cflags;
|
- }
|
-
|
- const page_size_t page_size(flags);
|
+ const page_size_t page_size(cursor->node->space->flags);
|
cursor->page_size = page_size;
|
|
/* Allocate read buffer */
|
{"report":{"fcp":834.4000000953674,"ttfb":200.60000014305115,"pageVisibility":"visible","entityId":64458,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":1,"journeyId":"e1089651-db41-4dee-8d0f-c2c3109ca29d","navigationType":0,"readyForUser":900.2999999523163,"redirectCount":0,"resourceLoadedEnd":1038.7999999523163,"resourceLoadedStart":206.29999995231628,"resourceTiming":[{"duration":185.70000004768372,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2bu7/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":206.29999995231628,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":206.29999995231628,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":392,"responseStart":0,"secureConnectionStart":0},{"duration":185.5,"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":206.60000014305115,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":206.60000014305115,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":392.10000014305115,"responseStart":0,"secureConnectionStart":0},{"duration":194.5,"initiatorType":"script","name":"https://jira.mariadb.org/s/fbf975c0cce4b1abf04784eeae9ba1f4-CDN/lu2bu7/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":206.70000004768372,"connectEnd":206.70000004768372,"connectStart":206.70000004768372,"domainLookupEnd":206.70000004768372,"domainLookupStart":206.70000004768372,"fetchStart":206.70000004768372,"redirectEnd":0,"redirectStart":0,"requestStart":206.70000004768372,"responseEnd":401.2000000476837,"responseStart":401.10000014305115,"secureConnectionStart":206.70000004768372},{"duration":219.60000014305115,"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":206.79999995231628,"connectEnd":206.79999995231628,"connectStart":206.79999995231628,"domainLookupEnd":206.79999995231628,"domainLookupStart":206.79999995231628,"fetchStart":206.79999995231628,"redirectEnd":0,"redirectStart":0,"requestStart":206.79999995231628,"responseEnd":426.40000009536743,"responseStart":426.40000009536743,"secureConnectionStart":206.79999995231628},{"duration":223.5,"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":207,"connectEnd":207,"connectStart":207,"domainLookupEnd":207,"domainLookupStart":207,"fetchStart":207,"redirectEnd":0,"redirectStart":0,"requestStart":207,"responseEnd":430.5,"responseStart":430.5,"secureConnectionStart":207},{"duration":223.79999995231628,"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":207.10000014305115,"connectEnd":207.10000014305115,"connectStart":207.10000014305115,"domainLookupEnd":207.10000014305115,"domainLookupStart":207.10000014305115,"fetchStart":207.10000014305115,"redirectEnd":0,"redirectStart":0,"requestStart":207.10000014305115,"responseEnd":430.90000009536743,"responseStart":430.90000009536743,"secureConnectionStart":207.10000014305115},{"duration":224.20000004768372,"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":207.20000004768372,"connectEnd":207.20000004768372,"connectStart":207.20000004768372,"domainLookupEnd":207.20000004768372,"domainLookupStart":207.20000004768372,"fetchStart":207.20000004768372,"redirectEnd":0,"redirectStart":0,"requestStart":207.20000004768372,"responseEnd":431.40000009536743,"responseStart":431.40000009536743,"secureConnectionStart":207.20000004768372},{"duration":225.60000014305115,"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":207.29999995231628,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":207.29999995231628,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":432.90000009536743,"responseStart":0,"secureConnectionStart":0},{"duration":225.5,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":207.40000009536743,"connectEnd":207.40000009536743,"connectStart":207.40000009536743,"domainLookupEnd":207.40000009536743,"domainLookupStart":207.40000009536743,"fetchStart":207.40000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":207.40000009536743,"responseEnd":432.90000009536743,"responseStart":432.90000009536743,"secureConnectionStart":207.40000009536743},{"duration":226.10000014305115,"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":207.5,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":207.5,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":433.60000014305115,"responseStart":0,"secureConnectionStart":0},{"duration":225.90000009536743,"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":207.70000004768372,"connectEnd":207.70000004768372,"connectStart":207.70000004768372,"domainLookupEnd":207.70000004768372,"domainLookupStart":207.70000004768372,"fetchStart":207.70000004768372,"redirectEnd":0,"redirectStart":0,"requestStart":207.70000004768372,"responseEnd":433.60000014305115,"responseStart":433.60000014305115,"secureConnectionStart":207.70000004768372},{"duration":408.89999985694885,"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":208.40000009536743,"connectEnd":208.40000009536743,"connectStart":208.40000009536743,"domainLookupEnd":208.40000009536743,"domainLookupStart":208.40000009536743,"fetchStart":208.40000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":208.40000009536743,"responseEnd":617.2999999523163,"responseStart":617.2999999523163,"secureConnectionStart":208.40000009536743},{"duration":830.2999999523163,"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":208.5,"connectEnd":208.5,"connectStart":208.5,"domainLookupEnd":208.5,"domainLookupStart":208.5,"fetchStart":208.5,"redirectEnd":0,"redirectStart":0,"requestStart":208.5,"responseEnd":1038.7999999523163,"responseStart":1038.7999999523163,"secureConnectionStart":208.5},{"duration":396.2999999523163,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":633.6000001430511,"connectEnd":633.6000001430511,"connectStart":633.6000001430511,"domainLookupEnd":633.6000001430511,"domainLookupStart":633.6000001430511,"fetchStart":633.6000001430511,"redirectEnd":0,"redirectStart":0,"requestStart":633.6000001430511,"responseEnd":1029.9000000953674,"responseStart":1029.9000000953674,"secureConnectionStart":633.6000001430511},{"duration":229.90000009536743,"initiatorType":"script","name":"https://www.google-analytics.com/analytics.js","startTime":812.7000000476837,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":812.7000000476837,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1042.6000001430511,"responseStart":0,"secureConnectionStart":0}],"fetchStart":0,"domainLookupStart":0,"domainLookupEnd":0,"connectStart":0,"connectEnd":0,"requestStart":81,"responseStart":201,"responseEnd":205,"domLoading":204,"domInteractive":1060,"domContentLoadedEventStart":1060,"domContentLoadedEventEnd":1094,"domComplete":1514,"loadEventStart":1514,"loadEventEnd":1516,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":1041.9000000953674},{"name":"bigPipe.sidebar-id.end","time":1042.7999999523163},{"name":"bigPipe.activity-panel-pipe-id.start","time":1043},{"name":"bigPipe.activity-panel-pipe-id.end","time":1045.2999999523163},{"name":"activityTabFullyLoaded","time":1101.7000000476837}],"measures":[],"correlationId":"2bd4dc99e3b175","effectiveType":"4g","downlink":10,"rtt":0,"serverDuration":67,"dbReadsTimeInMs":12,"dbConnsTimeInMs":19,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}