From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/4] xapcmd: preserve indexlevel based on the destination
Date: Fri, 14 Jun 2019 03:03:16 +0000 [thread overview]
Message-ID: <20190614030318.17216-3-e@80x24.org> (raw)
In-Reply-To: <20190614030318.17216-1-e@80x24.org>
To support M:N resharding, we need to ensure we store the
indexlevel in the destination shard, rather than the
originating one.
---
lib/PublicInbox/Xapcmd.pm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index dad080c..7204a91 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -145,7 +145,8 @@ sub run {
if ($v == 1) {
my $old_parent = dirname($old);
same_fs_or_die($old_parent, $old);
- $tmp->{$old} = tempdir('xapcmd-XXXXXXXX', DIR => $old_parent);
+ my $v = PublicInbox::Search::SCHEMA_VERSION();
+ $tmp->{$old} = tempdir("xapian$v-XXXXXXXX", DIR => $old_parent);
push @q, [ $old, $tmp->{$old} ];
} else {
opendir my $dh, $old or die "Failed to opendir $old: $!\n";
@@ -276,7 +277,7 @@ sub cpdb ($$) {
$dst->set_metadata('last_commit', $lc) if $lc;
# only the first xapian partition (0) gets 'indexlevel'
- if ($old =~ m!(?:xapian[0-9]+|xap[0-9]+/0)\z!) {
+ if ($new =~ m!(?:xapian[0-9]+|xap[0-9]+/0)\b!) {
my $l = $src->get_metadata('indexlevel');
if ($l eq 'medium') {
$dst->set_metadata('indexlevel', $l);
--
EW
next prev parent reply other threads:[~2019-06-14 3:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-14 3:03 [PATCH 0/4] xcpdb: support resharding Xapian DBs Eric Wong
2019-06-14 3:03 ` [PATCH 1/4] v2writable: use a smaller default for Xapian partitions Eric Wong
2019-06-14 3:03 ` Eric Wong [this message]
2019-06-14 3:03 ` [PATCH 3/4] xcpdb: use destination shard as progress prefix Eric Wong
2019-06-14 3:03 ` [PATCH 4/4] xcpdb: support resharding v2 repos Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190614030318.17216-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).