|
238 | 238 | # to our physical temp location. That way we can use shorter names |
239 | 239 | # for the tablespace directories, which hopefully won't run afoul of |
240 | 240 | # the 99 character length limit. |
241 | | -my $shorter_tempdir = TestLib::tempdir_short . "/tempdir"; |
| 241 | +my $sys_tempdir = TestLib::tempdir_short; |
| 242 | +my $real_sys_tempdir = TestLib::perl2host($sys_tempdir) . "/tempdir"; |
| 243 | +my $shorter_tempdir = $sys_tempdir . "/tempdir"; |
242 | 244 | dir_symlink "$tempdir", $shorter_tempdir; |
243 | 245 |
|
244 | 246 | mkdir "$tempdir/tblspc1"; |
245 | | -my $realTsDir = TestLib::perl2host("$shorter_tempdir/tblspc1"); |
| 247 | +my $realTsDir = "$real_sys_tempdir/tblspc1"; |
246 | 248 | my $real_tempdir = TestLib::perl2host($tempdir); |
247 | 249 | $node->safe_psql('postgres', |
248 | 250 | "CREATE TABLESPACE tblspc1 LOCATION '$realTsDir';"); |
|
275 | 277 |
|
276 | 278 | # Recover tablespace into a new directory (not where it was!) |
277 | 279 | my $repTsDir = "$tempdir/tblspc1replica"; |
278 | | - my $realRepTsDir = TestLib::perl2host("$shorter_tempdir/tblspc1replica"); |
| 280 | + my $realRepTsDir = "$real_sys_tempdir/tblspc1replica"; |
279 | 281 | mkdir $repTsDir; |
280 | 282 | TestLib::system_or_bail($tar, 'xf', $tblspc_tars[0], '-C', $repTsDir); |
281 | 283 |
|
|
390 | 392 | rmtree("$tempdir/backup1"); |
391 | 393 |
|
392 | 394 | mkdir "$tempdir/tbl=spc2"; |
393 | | -$realTsDir = TestLib::perl2host("$shorter_tempdir/tbl=spc2"); |
| 395 | +$realTsDir = "$real_sys_tempdir/tbl=spc2"; |
394 | 396 | $node->safe_psql('postgres', "DROP TABLE test1;"); |
395 | 397 | $node->safe_psql('postgres', "DROP TABLE tblspc1_unlogged;"); |
396 | 398 | $node->safe_psql('postgres', "DROP TABLESPACE tblspc1;"); |
|
409 | 411 | rmtree("$tempdir/backup3"); |
410 | 412 |
|
411 | 413 | mkdir "$tempdir/$superlongname"; |
412 | | -$realTsDir = TestLib::perl2host("$shorter_tempdir/$superlongname"); |
| 414 | +$realTsDir = "$real_sys_tempdir/$superlongname"; |
413 | 415 | $node->safe_psql('postgres', |
414 | 416 | "CREATE TABLESPACE tblspc3 LOCATION '$realTsDir';"); |
415 | 417 | $node->command_ok([ 'pg_basebackup', '-D', "$tempdir/tarbackup_l3", '-Ft' ], |
|
0 commit comments