* [PATCH 2/3] xcpdb: -R$SHARDS creates new shards with correct perms
2021-09-23 5:53 6% [PATCH 0/3] xcpdb-related fixes Eric Wong
@ 2021-09-23 5:53 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-09-23 5:53 UTC (permalink / raw)
To: meta
"Correct" meaning the permissions match that of the parent
xap15 or ei15 directory.
---
lib/PublicInbox/Xapcmd.pm | 15 ++++++++++-----
t/extsearch.t | 7 +++++++
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index b962fa84..daef896c 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -22,11 +22,16 @@ sub commit_changes ($$$$) {
$SIG{INT} or die 'BUG: $SIG{INT} not handled';
my @old_shard;
my $over_chg;
+ my $mode;
while (my ($old, $newdir) = each %$tmp) {
next if $old eq ''; # no invalid paths
- my @st = stat($old);
- if (!@st && !defined($opt->{reshard})) {
+ $mode //= do {
+ my ($dname) = ($old =~ m!(.*/)[^/]+/*\z!);
+ (stat($dname))[2];
+ };
+ my $have_old = -e $old;
+ if (!$have_old && !defined($opt->{reshard})) {
die "failed to stat($old): $!";
}
@@ -46,13 +51,13 @@ sub commit_changes ($$$$) {
next;
}
- if (@st) {
- chmod($st[2] & 07777, $new) or die "chmod $old: $!\n";
+ chmod($mode & 07777, $new) or die "chmod($new): $!\n";
+ if ($have_old) {
rename($old, "$new/old") or
die "rename $old => $new/old: $!\n";
}
rename($new, $old) or die "rename $new => $old: $!\n";
- if (@st) {
+ if ($have_old) {
my $prev = "$old/old";
remove_tree($prev) or
die "failed to remove $prev: $!\n";
diff --git a/t/extsearch.t b/t/extsearch.t
index ad4f2c6d..b2b994f6 100644
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -423,6 +423,7 @@ if ('dedupe + dry-run') {
'--dry-run alone fails');
}
+# chmod 0755, $home or xbail "chmod: $!";
for my $j (1, 3, 6) {
my $o = { 2 => \(my $err = '') };
my $d = "$home/extindex-j$j";
@@ -436,11 +437,17 @@ for my $j (1, 3, 6) {
SKIP: {
my $d = "$home/extindex-j1";
+ my @ei_dir = glob("$d/ei*/");
+ chmod 0755, $ei_dir[0] or xbail "chmod: $!";
+ my $mode = sprintf('%04o', 07777 & (stat($ei_dir[0]))[2]);
+ is($mode, '0755', 'mode set on ei*/ dir');
my $o = { 2 => \(my $err = '') };
ok(run_script([qw(-xcpdb -R4), $d]), 'xcpdb R4');
my @dirs = glob("$d/ei*/?");
for my $i (0..3) {
is(grep(m!/ei[0-9]+/$i\z!, @dirs), 1, "shard [$i] created");
+ my $m = sprintf('%04o', 07777 & (stat($dirs[$i]))[2]);
+ is($m, $mode, "shard [$i] mode");
}
for my $i (4..5) {
is(grep(m!/ei[0-9]+/$i\z!, @dirs), 0, "no shard [$i]");
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] xcpdb-related fixes
@ 2021-09-23 5:53 6% Eric Wong
2021-09-23 5:53 7% ` [PATCH 2/3] xcpdb: -R$SHARDS creates new shards with correct perms Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-09-23 5:53 UTC (permalink / raw)
To: meta
Some bugs I discovered while getting cleanup stuff working
better for read-only daemons.
Eric Wong (3):
test_common: reset umask on non-forking run_script
xcpdb: -R$SHARDS creates new shards with correct perms
xcpdb: avoid race when shards are added
lib/PublicInbox/TestCommon.pm | 2 ++
lib/PublicInbox/Xapcmd.pm | 34 +++++++++++++++++++++-------------
t/extsearch.t | 7 +++++++
3 files changed, 30 insertions(+), 13 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-09-23 5:53 6% [PATCH 0/3] xcpdb-related fixes Eric Wong
2021-09-23 5:53 7% ` [PATCH 2/3] xcpdb: -R$SHARDS creates new shards with correct perms Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).