* [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption
@ 2020-08-11 11:44 Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 1/4] btrfs-progs: check/lowmem: add the ability to repair extent item generation Qu Wenruo
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Qu Wenruo @ 2020-08-11 11:44 UTC (permalink / raw)
To: linux-btrfs
Although we have introduced the check ability to detect bad extent item
generation, there is no repair ability.
I thought it would be rare to hit, but real world cases prove I'm a
total idiot.
So this patchset will add the ability to repair, for both lowmem mode
and original mode, along with enhanced test images.
There is also a bug fix for original mode, which fails to detect such
problem if it's a tree block.
Changelog:
v2:
- Fix a type in the subject of the 4th patch
- Fix a bracket for for a logical and and bit and
The old code is fine and bit and has higher priority, but
the bracket is intended to make that higher priority more obvious.
Qu Wenruo (4):
btrfs-progs: check/lowmem: add the ability to repair extent item
generation
btrfs-progs: check/original: don't reset extent generation for
check_block()
btrfs-progs: check/original: add the ability to repair extent item
generation
btrfs-progs: tests/fsck: enhance invalid extent item generation test
cases
check/main.c | 77 ++++++++++++++-
check/mode-common.c | 59 ++++++++++++
check/mode-common.h | 3 +
check/mode-lowmem.c | 89 ++++++++++++++++--
...xz => bad_extent_item_gen_for_data.img.xz} | Bin
.../bad_extent_item_gen_for_tree_block.img.xz | Bin 0 -> 1804 bytes
.../test.sh | 19 ----
7 files changed, 216 insertions(+), 31 deletions(-)
rename tests/fsck-tests/044-invalid-extent-item-generation/{bad_extent_item_gen.img.xz => bad_extent_item_gen_for_data.img.xz} (100%)
create mode 100644 tests/fsck-tests/044-invalid-extent-item-generation/bad_extent_item_gen_for_tree_block.img.xz
delete mode 100755 tests/fsck-tests/044-invalid-extent-item-generation/test.sh
--
2.28.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/4] btrfs-progs: check/lowmem: add the ability to repair extent item generation
2020-08-11 11:44 [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption Qu Wenruo
@ 2020-08-11 11:44 ` Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 2/4] btrfs-progs: check/original: don't reset extent generation for check_block() Qu Wenruo
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Qu Wenruo @ 2020-08-11 11:44 UTC (permalink / raw)
To: linux-btrfs
There is an internal report about bad extent item generation triggering
tree-checker.
This patch will add the repair ability to btrfs check --mode=lowmem
mode, by resetting the generation field of extent item.
Currently the correct generation for tree block is fetched from its
header, while for data extent it uses transid as fallback.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
check/mode-common.c | 59 ++++++++++++++++++++++++++++++
check/mode-common.h | 3 ++
check/mode-lowmem.c | 89 +++++++++++++++++++++++++++++++++++++++++----
3 files changed, 144 insertions(+), 7 deletions(-)
diff --git a/check/mode-common.c b/check/mode-common.c
index aa45c5c2b8a3..a024f17126d0 100644
--- a/check/mode-common.c
+++ b/check/mode-common.c
@@ -1195,3 +1195,62 @@ int recow_extent_buffer(struct btrfs_root *root, struct extent_buffer *eb)
btrfs_release_path(&path);
return ret;
}
+
+/*
+ * Try to get a correct extent item geneartion.
+ * Return 0 if we get a correct generation.
+ * Return <0 if we failed to get one.
+ */
+int get_extent_item_generation(struct btrfs_fs_info *fs_info,
+ u64 bytenr, u64 *gen_ret)
+{
+ struct btrfs_root *root = fs_info->extent_root;
+ struct btrfs_extent_item *ei;
+ struct btrfs_path path;
+ struct btrfs_key key;
+ int ret;
+
+ key.objectid = bytenr;
+ key.type = BTRFS_METADATA_ITEM_KEY;
+ key.offset = (u64)-1;
+
+ btrfs_init_path(&path);
+ ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
+ /* Not possible */
+ if (ret == 0)
+ ret = -EUCLEAN;
+ if (ret < 0)
+ goto out;
+ ret = btrfs_previous_extent_item(root, &path, bytenr);
+ if (ret > 0)
+ ret = -ENOENT;
+ if (ret < 0)
+ goto out;
+
+ ei = btrfs_item_ptr(path.nodes[0], path.slots[0],
+ struct btrfs_extent_item);
+
+ if (btrfs_extent_flags(path.nodes[0], ei) &
+ BTRFS_EXTENT_FLAG_TREE_BLOCK) {
+ struct extent_buffer *eb;
+
+ eb = read_tree_block(fs_info, bytenr, 0);
+ if (extent_buffer_uptodate(eb)) {
+ *gen_ret = btrfs_header_generation(eb);
+ ret = 0;
+ } else {
+ ret = -EIO;
+ }
+ free_extent_buffer(eb);
+ } else {
+ /*
+ * TODO: Grab proper data generation for data extents.
+ * But this is not an urgent objective, as we can still
+ * use transaction id as fall back
+ */
+ ret = -ENOTSUP;
+ }
+out:
+ btrfs_release_path(&path);
+ return ret;
+}
diff --git a/check/mode-common.h b/check/mode-common.h
index edf9257edaf0..3292ec744490 100644
--- a/check/mode-common.h
+++ b/check/mode-common.h
@@ -173,4 +173,7 @@ static inline u32 btrfs_type_to_imode(u8 type)
return imode_by_btrfs_type[(type)];
}
+
+int get_extent_item_generation(struct btrfs_fs_info *fs_info,
+ u64 bytenr, u64 *gen_ret);
#endif
diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c
index 747a21b21b85..1aca1a645ce4 100644
--- a/check/mode-lowmem.c
+++ b/check/mode-lowmem.c
@@ -4146,6 +4146,66 @@ out:
return ret;
}
+/*
+ * Reset generation for extent item specified by @path.
+ * Will try to grab the proper generation number from other sources, but if
+ * failed to grab, then use current transid as fallback.
+ *
+ * Returns < 0 for error.
+ * Return 0 if the generation is reset.
+ */
+static int repair_extent_item_generation(struct btrfs_fs_info *fs_info,
+ struct btrfs_path *path)
+{
+ struct btrfs_trans_handle *trans;
+ struct btrfs_key key;
+ struct btrfs_extent_item *ei;
+ struct btrfs_root *extent_root = fs_info->extent_root;
+ u64 new_gen = 0;;
+ int ret;
+
+ btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
+ ASSERT(key.type == BTRFS_METADATA_ITEM_KEY ||
+ key.type == BTRFS_EXTENT_ITEM_KEY);
+
+ get_extent_item_generation(fs_info, key.objectid, &new_gen);
+ ret = avoid_extents_overwrite(fs_info);
+ if (ret)
+ return ret;
+ btrfs_release_path(path);
+ trans = btrfs_start_transaction(extent_root, 1);
+ if (IS_ERR(trans)) {
+ ret = PTR_ERR(trans);
+ errno = -ret;
+ error("failed to start transaction: %m");
+ return ret;
+ }
+ ret = btrfs_search_slot(trans, extent_root, &key, path, 0, 1);
+ if (ret > 0)
+ ret = -ENOENT;
+ if (ret < 0) {
+ errno = -ret;
+ error("failed to locate extent item for %llu: %m", key.objectid);
+ btrfs_abort_transaction(trans, ret);
+ return ret;
+ }
+ if (!new_gen)
+ new_gen = trans->transid;
+ ei = btrfs_item_ptr(path->nodes[0], path->slots[0],
+ struct btrfs_extent_item);
+ btrfs_set_extent_generation(path->nodes[0], ei, new_gen);
+ ret = btrfs_commit_transaction(trans, extent_root);
+ if (ret < 0) {
+ errno = -ret;
+ error("failed to commit transaction: %m");
+ btrfs_abort_transaction(trans, ret);
+ return ret;
+ }
+ printf("Reset extent item (%llu) generation to %llu\n",
+ key.objectid, new_gen);
+ return ret;
+}
+
/*
* This function will check a given extent item, including its backref and
* itself (like crossing stripe boundary and type)
@@ -4178,7 +4238,7 @@ static int check_extent_item(struct btrfs_fs_info *fs_info,
struct btrfs_key key;
int ret;
int err = 0;
- int tmp_err;
+ int tmp_err = 0;
u32 ptr_offset;
btrfs_item_key_to_cpu(eb, &key, slot);
@@ -4208,7 +4268,7 @@ static int check_extent_item(struct btrfs_fs_info *fs_info,
error(
"invalid generation for extent %llu, have %llu expect (0, %llu]",
key.objectid, gen, super_gen + 1);
- err |= INVALID_GENERATION;
+ tmp_err |= INVALID_GENERATION;
}
if (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK)
@@ -4261,12 +4321,12 @@ next:
case BTRFS_TREE_BLOCK_REF_KEY:
root_objectid = offset;
owner = level;
- tmp_err = check_tree_block_backref(fs_info, offset,
+ tmp_err |= check_tree_block_backref(fs_info, offset,
key.objectid, level);
break;
case BTRFS_SHARED_BLOCK_REF_KEY:
parent = offset;
- tmp_err = check_shared_block_backref(fs_info, offset,
+ tmp_err |= check_shared_block_backref(fs_info, offset,
key.objectid, level);
break;
case BTRFS_EXTENT_DATA_REF_KEY:
@@ -4274,13 +4334,13 @@ next:
root_objectid = btrfs_extent_data_ref_root(eb, dref);
owner = btrfs_extent_data_ref_objectid(eb, dref);
owner_offset = btrfs_extent_data_ref_offset(eb, dref);
- tmp_err = check_extent_data_backref(fs_info, root_objectid,
+ tmp_err |= check_extent_data_backref(fs_info, root_objectid,
owner, owner_offset, key.objectid, key.offset,
btrfs_extent_data_ref_count(eb, dref));
break;
case BTRFS_SHARED_DATA_REF_KEY:
parent = offset;
- tmp_err = check_shared_data_backref(fs_info, offset,
+ tmp_err |= check_shared_data_backref(fs_info, offset,
key.objectid);
break;
default:
@@ -4318,8 +4378,23 @@ next:
item_size = btrfs_item_size_nr(eb, slot);
goto next;
}
- } else {
+ }
+ if (((tmp_err & INVALID_GENERATION) && repair)){
+ ret = repair_extent_item_generation(fs_info, path);
+ if (ret < 0) {
+ err |= tmp_err;
+ err |= FATAL_ERROR;
+ goto out;
+ }
+ /* Error has been repaired */
+ tmp_err &= ~INVALID_GENERATION;
err |= tmp_err;
+ eb = path->nodes[0];
+ slot = path->slots[0];
+ ei = btrfs_item_ptr(eb, slot, struct btrfs_extent_item);
+ item_size = btrfs_item_size_nr(eb, slot);
+ ptr_offset += btrfs_extent_inline_ref_size(type);
+ goto next;
}
ptr_offset += btrfs_extent_inline_ref_size(type);
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/4] btrfs-progs: check/original: don't reset extent generation for check_block()
2020-08-11 11:44 [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 1/4] btrfs-progs: check/lowmem: add the ability to repair extent item generation Qu Wenruo
@ 2020-08-11 11:44 ` Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 3/4] btrfs-progs: check/original: add the ability to repair extent item generation Qu Wenruo
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Qu Wenruo @ 2020-08-11 11:44 UTC (permalink / raw)
To: linux-btrfs
In check_block(), we unconditionally reset extent_record::generation.
This is in fact pretty correct, but this makes original mode fail to
detect bad extent item geneartion.
So change to behavior to set the geneartion if and only if the tree
block generation is higher.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
check/main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/check/main.c b/check/main.c
index f93bd7d4ca70..72fa28ad216a 100644
--- a/check/main.c
+++ b/check/main.c
@@ -4440,7 +4440,8 @@ static int check_block(struct btrfs_root *root,
if (!cache)
return 1;
rec = container_of(cache, struct extent_record, cache);
- rec->generation = btrfs_header_generation(buf);
+ if (rec->generation < btrfs_header_generation(buf))
+ rec->generation = btrfs_header_generation(buf);
level = btrfs_header_level(buf);
if (btrfs_header_nritems(buf) > 0) {
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/4] btrfs-progs: check/original: add the ability to repair extent item generation
2020-08-11 11:44 [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 1/4] btrfs-progs: check/lowmem: add the ability to repair extent item generation Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 2/4] btrfs-progs: check/original: don't reset extent generation for check_block() Qu Wenruo
@ 2020-08-11 11:44 ` Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 4/4] btrfs-progs: tests/fsck: enhance invalid extent item generation test cases Qu Wenruo
2020-12-01 17:45 ` [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption David Sterba
4 siblings, 0 replies; 6+ messages in thread
From: Qu Wenruo @ 2020-08-11 11:44 UTC (permalink / raw)
To: linux-btrfs
This is pretty much the same as the lowmem mode, it will try to reset
the extent item generation using either the tree block generation or
current transid.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
check/main.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 70 insertions(+), 4 deletions(-)
diff --git a/check/main.c b/check/main.c
index 72fa28ad216a..dc366b125ece 100644
--- a/check/main.c
+++ b/check/main.c
@@ -7914,6 +7914,63 @@ static int record_unaligned_extent_rec(struct btrfs_fs_info *fs_info,
return ret;
}
+static int repair_extent_item_generation(struct btrfs_fs_info *fs_info,
+ struct extent_record *rec)
+{
+ struct btrfs_trans_handle *trans;
+ struct btrfs_path path;
+ struct btrfs_key key;
+ struct btrfs_extent_item *ei;
+ struct btrfs_root *extent_root = fs_info->extent_root;
+ u64 new_gen = 0;;
+ int ret;
+
+ key.objectid = rec->start;
+ key.type = BTRFS_METADATA_ITEM_KEY;
+ key.offset = (u64)-1;
+
+ get_extent_item_generation(fs_info, rec->start, &new_gen);
+ trans = btrfs_start_transaction(extent_root, 1);
+ if (IS_ERR(trans)) {
+ ret = PTR_ERR(trans);
+ errno = -ret;
+ error("failed to start transaction: %m");
+ return ret;
+ }
+ btrfs_init_path(&path);
+ ret = btrfs_search_slot(trans, extent_root, &key, &path, 0, 1);
+ /* Not possible */
+ if (ret == 0)
+ ret = -EUCLEAN;
+ if (ret < 0)
+ goto out;
+ ret = btrfs_previous_extent_item(extent_root, &path, rec->start);
+ if (ret > 0)
+ ret = -ENOENT;
+ if (ret < 0)
+ goto out;
+
+ if (!new_gen)
+ new_gen = trans->transid;
+ ei = btrfs_item_ptr(path.nodes[0], path.slots[0],
+ struct btrfs_extent_item);
+ btrfs_set_extent_generation(path.nodes[0], ei, new_gen);
+ ret = btrfs_commit_transaction(trans, extent_root);
+ if (ret < 0) {
+ errno = -ret;
+ error("failed to commit transaction: %m");
+ goto out;
+ }
+ printf("Reset extent item (%llu) generation to %llu\n",
+ key.objectid, new_gen);
+ rec->generation = new_gen;
+out:
+ btrfs_release_path(&path);
+ if (ret < 0)
+ btrfs_abort_transaction(trans, ret);
+ return ret;
+}
+
static int check_extent_refs(struct btrfs_root *root,
struct cache_tree *extent_cache)
{
@@ -8004,11 +8061,20 @@ static int check_extent_refs(struct btrfs_root *root,
}
if (rec->generation > super_gen + 1) {
- error(
+ bool repaired = false;
+ if (repair) {
+ ret = repair_extent_item_generation(
+ root->fs_info, rec);
+ if (ret == 0)
+ repaired = true;
+ }
+ if (!repaired) {
+ error(
"invalid generation for extent %llu, have %llu expect (0, %llu]",
- rec->start, rec->generation,
- super_gen + 1);
- cur_err = 1;
+ rec->start, rec->generation,
+ super_gen + 1);
+ cur_err = 1;
+ }
}
if (rec->refs != rec->extent_item_refs) {
fprintf(stderr, "ref mismatch on [%llu %llu] ",
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/4] btrfs-progs: tests/fsck: enhance invalid extent item generation test cases
2020-08-11 11:44 [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption Qu Wenruo
` (2 preceding siblings ...)
2020-08-11 11:44 ` [PATCH v2 3/4] btrfs-progs: check/original: add the ability to repair extent item generation Qu Wenruo
@ 2020-08-11 11:44 ` Qu Wenruo
2020-12-01 17:45 ` [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption David Sterba
4 siblings, 0 replies; 6+ messages in thread
From: Qu Wenruo @ 2020-08-11 11:44 UTC (permalink / raw)
To: linux-btrfs
This patch will:
- Add a new test image for fsck/044
This new image has a corrupted extent item generation for tree block.
This image can expose a bug in original mode, which can't detect the
problem.
This image also utilize the tree block generation detection code,
which the existing image doesn't.
- Rename the existing image
To reflect the fact that the existing one is only for data extent.
- Remove the test.sh
So that the generic path will test both detection and repair.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
...xz => bad_extent_item_gen_for_data.img.xz} | Bin
.../bad_extent_item_gen_for_tree_block.img.xz | Bin 0 -> 1804 bytes
.../test.sh | 19 ------------------
3 files changed, 19 deletions(-)
rename tests/fsck-tests/044-invalid-extent-item-generation/{bad_extent_item_gen.img.xz => bad_extent_item_gen_for_data.img.xz} (100%)
create mode 100644 tests/fsck-tests/044-invalid-extent-item-generation/bad_extent_item_gen_for_tree_block.img.xz
delete mode 100755 tests/fsck-tests/044-invalid-extent-item-generation/test.sh
diff --git a/tests/fsck-tests/044-invalid-extent-item-generation/bad_extent_item_gen.img.xz b/tests/fsck-tests/044-invalid-extent-item-generation/bad_extent_item_gen_for_data.img.xz
similarity index 100%
rename from tests/fsck-tests/044-invalid-extent-item-generation/bad_extent_item_gen.img.xz
rename to tests/fsck-tests/044-invalid-extent-item-generation/bad_extent_item_gen_for_data.img.xz
diff --git a/tests/fsck-tests/044-invalid-extent-item-generation/bad_extent_item_gen_for_tree_block.img.xz b/tests/fsck-tests/044-invalid-extent-item-generation/bad_extent_item_gen_for_tree_block.img.xz
new file mode 100644
index 0000000000000000000000000000000000000000..8bc4688dea9c952282b7124fc53175fe1ebd9c4f
GIT binary patch
literal 1804
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
literal 0
HcmV?d00001
diff --git a/tests/fsck-tests/044-invalid-extent-item-generation/test.sh b/tests/fsck-tests/044-invalid-extent-item-generation/test.sh
deleted file mode 100755
index 2b88a3c7b3bb..000000000000
--- a/tests/fsck-tests/044-invalid-extent-item-generation/test.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# Due to a bug in --init-extent-tree option, we may create bad generation
-# number for data extents.
-#
-# This test case will ensure btrfs check can at least detect such problem,
-# just like kernel tree-checker.
-
-source "$TEST_TOP/common"
-
-check_prereq btrfs
-
-check_image() {
- run_mustfail \
- "btrfs check failed to detect invalid extent item generation" \
- "$TOP/btrfs" check "$1"
-}
-
-check_all_images
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption
2020-08-11 11:44 [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption Qu Wenruo
` (3 preceding siblings ...)
2020-08-11 11:44 ` [PATCH v2 4/4] btrfs-progs: tests/fsck: enhance invalid extent item generation test cases Qu Wenruo
@ 2020-12-01 17:45 ` David Sterba
4 siblings, 0 replies; 6+ messages in thread
From: David Sterba @ 2020-12-01 17:45 UTC (permalink / raw)
To: Qu Wenruo; +Cc: linux-btrfs
On Tue, Aug 11, 2020 at 07:44:47PM +0800, Qu Wenruo wrote:
> Although we have introduced the check ability to detect bad extent item
> generation, there is no repair ability.
>
> I thought it would be rare to hit, but real world cases prove I'm a
> total idiot.
>
> So this patchset will add the ability to repair, for both lowmem mode
> and original mode, along with enhanced test images.
>
> There is also a bug fix for original mode, which fails to detect such
> problem if it's a tree block.
>
> Changelog:
> v2:
> - Fix a type in the subject of the 4th patch
> - Fix a bracket for for a logical and and bit and
> The old code is fine and bit and has higher priority, but
> the bracket is intended to make that higher priority more obvious.
>
> Qu Wenruo (4):
> btrfs-progs: check/lowmem: add the ability to repair extent item
> generation
> btrfs-progs: check/original: don't reset extent generation for
> check_block()
> btrfs-progs: check/original: add the ability to repair extent item
> generation
> btrfs-progs: tests/fsck: enhance invalid extent item generation test
> cases
Added to devel, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-01 17:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-11 11:44 [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 1/4] btrfs-progs: check/lowmem: add the ability to repair extent item generation Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 2/4] btrfs-progs: check/original: don't reset extent generation for check_block() Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 3/4] btrfs-progs: check/original: add the ability to repair extent item generation Qu Wenruo
2020-08-11 11:44 ` [PATCH v2 4/4] btrfs-progs: tests/fsck: enhance invalid extent item generation test cases Qu Wenruo
2020-12-01 17:45 ` [PATCH v2 0/4] btrfs-progs: check: add the ability to repair extent item generation corruption David Sterba
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.