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":990.1000003814697,"ttfb":159.10000038146973,"pageVisibility":"visible","entityId":64458,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":0.5,"journeyId":"1be8fd7c-2cba-4e7f-8740-aa7ff9b5b5cd","navigationType":0,"readyForUser":1075.1000003814697,"redirectCount":0,"resourceLoadedEnd":903,"resourceLoadedStart":164.7000002861023,"resourceTiming":[{"duration":48.40000009536743,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2cib/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":164.7000002861023,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":164.7000002861023,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":213.10000038146973,"responseStart":0,"secureConnectionStart":0},{"duration":187.90000009536743,"initiatorType":"link","name":"https://jira.mariadb.org/s/7ebd35e77e471bc30ff0eba799ebc151-CDN/lu2cib/820016/12ta74/494e4c556ecbb29f90a3d3b4f09cb99c/_/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&whisper-enabled=true","startTime":164.90000009536743,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":164.90000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":352.80000019073486,"responseStart":0,"secureConnectionStart":0},{"duration":359.69999980926514,"initiatorType":"script","name":"https://jira.mariadb.org/s/0917945aaa57108d00c5076fea35e069-CDN/lu2cib/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":165.10000038146973,"connectEnd":165.10000038146973,"connectStart":165.10000038146973,"domainLookupEnd":165.10000038146973,"domainLookupStart":165.10000038146973,"fetchStart":165.10000038146973,"redirectEnd":0,"redirectStart":0,"requestStart":165.10000038146973,"responseEnd":524.8000001907349,"responseStart":524.8000001907349,"secureConnectionStart":165.10000038146973},{"duration":448.90000009536743,"initiatorType":"script","name":"https://jira.mariadb.org/s/2d8175ec2fa4c816e8023260bd8c1786-CDN/lu2cib/820016/12ta74/494e4c556ecbb29f90a3d3b4f09cb99c/_/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&whisper-enabled=true","startTime":165.30000019073486,"connectEnd":165.30000019073486,"connectStart":165.30000019073486,"domainLookupEnd":165.30000019073486,"domainLookupStart":165.30000019073486,"fetchStart":165.30000019073486,"redirectEnd":0,"redirectStart":0,"requestStart":165.30000019073486,"responseEnd":614.2000002861023,"responseStart":614.2000002861023,"secureConnectionStart":165.30000019073486},{"duration":452.80000019073486,"initiatorType":"script","name":"https://jira.mariadb.org/s/a9324d6758d385eb45c462685ad88f1d-CDN/lu2cib/820016/12ta74/c92c0caa9a024ae85b0ebdbed7fb4bd7/_/download/contextbatch/js/atl.global,-_super/batch.js?locale=en","startTime":165.40000009536743,"connectEnd":165.40000009536743,"connectStart":165.40000009536743,"domainLookupEnd":165.40000009536743,"domainLookupStart":165.40000009536743,"fetchStart":165.40000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":165.40000009536743,"responseEnd":618.2000002861023,"responseStart":618.2000002861023,"secureConnectionStart":165.40000009536743},{"duration":453.09999990463257,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-en/jira.webresources:calendar-en.js","startTime":165.7000002861023,"connectEnd":165.7000002861023,"connectStart":165.7000002861023,"domainLookupEnd":165.7000002861023,"domainLookupStart":165.7000002861023,"fetchStart":165.7000002861023,"redirectEnd":0,"redirectStart":0,"requestStart":165.7000002861023,"responseEnd":618.8000001907349,"responseStart":618.8000001907349,"secureConnectionStart":165.7000002861023},{"duration":504.5,"initiatorType":"link","name":"https://jira.mariadb.org/s/b04b06a02d1959df322d9cded3aeecc1-CDN/lu2cib/820016/12ta74/a2ff6aa845ffc9a1d22fe23d9ee791fc/_/download/contextbatch/css/jira.global.look-and-feel,-_super/batch.css","startTime":165.90000009536743,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":165.90000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":670.4000000953674,"responseStart":0,"secureConnectionStart":0},{"duration":453.30000019073486,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-localisation-moment/jira.webresources:calendar-localisation-moment.js","startTime":165.90000009536743,"connectEnd":165.90000009536743,"connectStart":165.90000009536743,"domainLookupEnd":165.90000009536743,"domainLookupStart":165.90000009536743,"fetchStart":165.90000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":165.90000009536743,"responseEnd":619.2000002861023,"responseStart":619.2000002861023,"secureConnectionStart":165.90000009536743},{"duration":453.5,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":166.2000002861023,"connectEnd":166.2000002861023,"connectStart":166.2000002861023,"domainLookupEnd":166.2000002861023,"domainLookupStart":166.2000002861023,"fetchStart":166.2000002861023,"redirectEnd":0,"redirectStart":0,"requestStart":166.2000002861023,"responseEnd":619.7000002861023,"responseStart":619.7000002861023,"secureConnectionStart":166.2000002861023},{"duration":504.19999980926514,"initiatorType":"link","name":"https://jira.mariadb.org/s/3ac36323ba5e4eb0af2aa7ac7211b4bb-CDN/lu2cib/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":166.30000019073486,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":166.30000019073486,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":670.5,"responseStart":0,"secureConnectionStart":0},{"duration":453.80000019073486,"initiatorType":"script","name":"https://jira.mariadb.org/s/5d5e8fe91fbc506585e83ea3b62ccc4b-CDN/lu2cib/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":166.5,"connectEnd":166.5,"connectStart":166.5,"domainLookupEnd":166.5,"domainLookupStart":166.5,"fetchStart":166.5,"redirectEnd":0,"redirectStart":0,"requestStart":166.5,"responseEnd":620.3000001907349,"responseStart":620.3000001907349,"secureConnectionStart":166.5},{"duration":558.1000003814697,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-js/jira.webresources:bigpipe-js.js","startTime":167.5,"connectEnd":167.5,"connectStart":167.5,"domainLookupEnd":167.5,"domainLookupStart":167.5,"fetchStart":167.5,"redirectEnd":0,"redirectStart":0,"requestStart":167.5,"responseEnd":725.6000003814697,"responseStart":725.6000003814697,"secureConnectionStart":167.5},{"duration":735.3999996185303,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-init/jira.webresources:bigpipe-init.js","startTime":167.60000038146973,"connectEnd":167.60000038146973,"connectStart":167.60000038146973,"domainLookupEnd":167.60000038146973,"domainLookupStart":167.60000038146973,"fetchStart":167.60000038146973,"redirectEnd":0,"redirectStart":0,"requestStart":167.60000038146973,"responseEnd":903,"responseStart":903,"secureConnectionStart":167.60000038146973},{"duration":52.69999980926514,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":681.7000002861023,"connectEnd":681.7000002861023,"connectStart":681.7000002861023,"domainLookupEnd":681.7000002861023,"domainLookupStart":681.7000002861023,"fetchStart":681.7000002861023,"redirectEnd":0,"redirectStart":0,"requestStart":681.7000002861023,"responseEnd":734.4000000953674,"responseStart":734.4000000953674,"secureConnectionStart":681.7000002861023}],"fetchStart":0,"domainLookupStart":0,"domainLookupEnd":0,"connectStart":0,"connectEnd":0,"requestStart":4,"responseStart":159,"responseEnd":163,"domLoading":163,"domInteractive":1132,"domContentLoadedEventStart":1132,"domContentLoadedEventEnd":1192,"domComplete":1744,"loadEventStart":1744,"loadEventEnd":1745,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":1111.8000001907349},{"name":"bigPipe.sidebar-id.end","time":1112.7000002861023},{"name":"bigPipe.activity-panel-pipe-id.start","time":1112.8000001907349},{"name":"bigPipe.activity-panel-pipe-id.end","time":1116},{"name":"activityTabFullyLoaded","time":1199.4000000953674}],"measures":[],"correlationId":"6338ef6684cf03","effectiveType":"4g","downlink":9.5,"rtt":0,"serverDuration":93,"dbReadsTimeInMs":10,"dbConnsTimeInMs":19,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}