Fixed unneeded reindex

The condition checking if reindex was needed was broken because `-v`
switch of `grep` only inverts matched lines, not exit code. As a result
reindex was triggerred even when not needed.

As a part of this fix, the change contains two important improvements to
tests:

* Test that reindex is not triggerred when not needed
* Ability to switch from which repository to test update

Closes #108

Makefile

@@ -1,5 +1,6 @@
 MAINTAINER="Martin Habostiak <[email protected]>"
 
+UPGRADE_REPO=experimental
 SOURCE_DIR:=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 BITCOIN_SOURCE_DIR=$(SOURCE_DIR)bitcoin/
 # Forgetting to type this resulted in lot of time wasted.
@@ -48,7 +49,7 @@ test-here: test-here-all-basic test-here-all-nonconfict-upgrade
 test-in-qubes-dvm: test-split-$(SPLIT_STRATEGY) $(addprefix test-in-qubes-dvm-multi-package-,$(TEST_MULTI_PACKAGE))
 
 test-split-none:
-	$(SOURCE_DIR)/tests/qubes-tools/test-in-dispvm.sh "$(BUILD_DIR)" "$(SOURCE_DIR)" "TEST_ALL_PACKAGES=$(TEST_ALL_PACKAGES)" "DPKG_DEBUG_LEVEL=$(DPKG_DEBUG_LEVEL)" test-here
+	$(SOURCE_DIR)/tests/qubes-tools/test-in-dispvm.sh "$(BUILD_DIR)" "$(SOURCE_DIR)" "TEST_ALL_PACKAGES=$(TEST_ALL_PACKAGES)" "DPKG_DEBUG_LEVEL=$(DPKG_DEBUG_LEVEL)" "UPGRADE_REPO=$(UPGRADE_REPO)" test-here
 
 test-split-upgrade: test-in-qubes-dvm-all-basic $(addprefix test-in-qubes-dvm-upgrade-,$(TEST_ALL_PACKAGES))
 
@@ -57,7 +58,7 @@ test-split-all: $(addprefix test-in-qubes-dvm-basic-,$(TEST_ALL_PACKAGES)) $(add
 test-package-%: test-$(TEST_STRATEGY)-basic-%
 
 test-in-qubes-dvm-multi-package-%: tests/multi-package/%.sh
-	$(SOURCE_DIR)/tests/qubes-tools/test-in-dispvm.sh "$(BUILD_DIR)" "$(SOURCE_DIR)" "TEST_MULTI_PACKAGE=$(TEST_MULTI_PACKAGE)" "DPKG_DEBUG_LEVEL=$(DPKG_DEBUG_LEVEL)" "test-here-multi-package-$*"
+	$(SOURCE_DIR)/tests/qubes-tools/test-in-dispvm.sh "$(BUILD_DIR)" "$(SOURCE_DIR)" "TEST_MULTI_PACKAGE=$(TEST_MULTI_PACKAGE)" "DPKG_DEBUG_LEVEL=$(DPKG_DEBUG_LEVEL)" "UPGRADE_REPO=$(UPGRADE_REPO)" "test-here-multi-package-$*"
 
 test-here-multi-package-%: tests/multi-package/%.sh
 	$(SOURCE_DIR)/tests/prepare_machine.sh "$(BUILD_DIR)"
@@ -71,12 +72,12 @@ test-here-basic-%: test-here-prepare-machine
 	$(SOURCE_DIR)/tests/package_clean_install.sh "$(BUILD_DIR)" "$*"
 
 test-here-upgrade-%: | $(UPGRADE_DEPS)
-	$(SOURCE_DIR)/tests/before_upgrade.sh "$(BUILD_DIR)" "$*"
+	$(SOURCE_DIR)/tests/before_upgrade.sh "$(BUILD_DIR)" "$(UPGRADE_REPO)" "$*"
 	$(SOURCE_DIR)/tests/prepare_machine.sh "$(BUILD_DIR)"
 	$(SOURCE_DIR)/tests/upgrade_package.sh "$(BUILD_DIR)" "$*"
 
 test-here-prepare-all-nonconfict-upgrade: | $(UPGRADE_DEPS)
-	$(SOURCE_DIR)/tests/before_upgrade.sh "$(BUILD_DIR)" "$(TEST_ALL_PACKAGES_NON_CONFLICT)"
+	$(SOURCE_DIR)/tests/before_upgrade.sh "$(BUILD_DIR)" "$(UPGRADE_REPO)" "$(TEST_ALL_PACKAGES_NON_CONFLICT)"
 	$(SOURCE_DIR)/tests/prepare_machine.sh "$(BUILD_DIR)"
 
 test-here-single-nonconfict-upgrade-%: test-here-prepare-all-nonconfict-upgrade | $(UPGRADE_DEPS)
@@ -88,10 +89,10 @@ test-here-prepare-machine:
 	$(SOURCE_DIR)/tests/prepare_machine.sh "$(BUILD_DIR)"
 
 test-in-qubes-dvm-all-basic:
-	$(SOURCE_DIR)/tests/qubes-tools/test-in-dispvm.sh "$(BUILD_DIR)" "$(SOURCE_DIR)" "TEST_ALL_PACKAGES=$(TEST_ALL_PACKAGES)" "DPKG_DEBUG_LEVEL=$(DPKG_DEBUG_LEVEL)" test-here-all-basic
+	$(SOURCE_DIR)/tests/qubes-tools/test-in-dispvm.sh "$(BUILD_DIR)" "$(SOURCE_DIR)" "TEST_ALL_PACKAGES=$(TEST_ALL_PACKAGES)" "DPKG_DEBUG_LEVEL=$(DPKG_DEBUG_LEVEL)" "UPGRADE_REPO=$(UPGRADE_REPO)" test-here-all-basic
 
 test-in-qubes-dvm-basic-%:
-	$(SOURCE_DIR)/tests/qubes-tools/test-in-dispvm.sh "$(BUILD_DIR)" "$(SOURCE_DIR)" "TEST_ALL_PACKAGES=$(TEST_ALL_PACKAGES)" "DPKG_DEBUG_LEVEL=$(DPKG_DEBUG_LEVEL)" "test-here-basic-$*"
+	$(SOURCE_DIR)/tests/qubes-tools/test-in-dispvm.sh "$(BUILD_DIR)" "$(SOURCE_DIR)" "TEST_ALL_PACKAGES=$(TEST_ALL_PACKAGES)" "DPKG_DEBUG_LEVEL=$(DPKG_DEBUG_LEVEL)" "UPGRADE_REPO=$(UPGRADE_REPO)" "test-here-basic-$*"
 
 test-in-qubes-dvm-upgrade-%:
-	$(SOURCE_DIR)/tests/qubes-tools/test-in-dispvm.sh "$(BUILD_DIR)" "$(SOURCE_DIR)" SPLIT_STRATEGY=upgrade "TEST_ALL_PACKAGES=$(TEST_ALL_PACKAGES)" "DPKG_DEBUG_LEVEL=$(DPKG_DEBUG_LEVEL)" "test-here-upgrade-$*"
+	$(SOURCE_DIR)/tests/qubes-tools/test-in-dispvm.sh "$(BUILD_DIR)" "$(SOURCE_DIR)" SPLIT_STRATEGY=upgrade "TEST_ALL_PACKAGES=$(TEST_ALL_PACKAGES)" "DPKG_DEBUG_LEVEL=$(DPKG_DEBUG_LEVEL)" "UPGRADE_REPO=$(UPGRADE_REPO)" "test-here-upgrade-$*"

bitcoin/check_needs_reindex.sh

@@ -14,14 +14,27 @@ fi
 
 . /usr/share/bitcoind/definitions.sh || exit 1
 
+function get_prune_value() {
+	local config_file
+	local prune_line
+	local prune_value
+
+	config_file="$1"
+	# we don't use pipe because we prefer to kill the script in case of a problem
+	prune_line="`grep '^ *prune *=' "$config_file"`" || exit 1
+	echo $prune_line | sed -e 's/^ *prune *= *//' -e 's/ *$//' || exit 1
+}
+
 if [ -d "$conf_dir" ];
 then
 	# if the file doesn't exist it's first install
 	if [ -f "$prev_chain_mode_file" ];
 	then
+		prev_prune_value="`get_prune_value "$prev_chain_mode_file"`"
+		cur_prune_value="`get_prune_value "$chain_mode_file"`"
 		# If pruning was enabled (different from 0) previously and it's disabled (0) now, we need to reindex
 		# Note that txindex is handled by bitcoind, no need to check that.
-		if grep -qv '^ *prune *= *0 *$' "$prev_chain_mode_file" && grep -q '^ *prune *= *0 *$' "$chain_mode_file";
+		if [ "$prev_prune_value" != 0 ] && [ "$cur_prune_value" = 0 ];
 		then
 			echo "Info: The chain will be reindexed after restart" >&2
 			touch "$needs_reindex_marker_file"

pkg_specs/bitcoin-@variant.sps

@@ -1,6 +1,6 @@
 name = "bitcoin-@variant"
 bin_package = "bitcoind"
-min_patch = "9"
+min_patch = "10"
 binary = "/usr/share/bitcoind/bitcoind"
 conf_param = "-conf="
 user = { group = true, create = { home = true } }

pkg_specs/bitcoin.changelog

@@ -1,3 +1,9 @@
+bitcoin (0.20.0-10) buster; urgency=medium
+
+  * Fixed bug causing bitcoind to always reindex after upgrade/install
+
+ -- Martin Habovstiak <[email protected]>  Tue, 5 Jan 2021 15:12:21 +0100
+
 bitcoin (0.20.0-9) buster; urgency=medium
 
   * Reindex when changing from pruned to non-pruned

tests/before_upgrade.sh

@@ -4,13 +4,14 @@ set -e
 
 test_dir="`dirname "$0"`"
 pkg_dir="$1"
-packages="$2"
+upgrade_from="$2"
+packages="$3"
 
 . "$test_dir/common.sh"
 
-test -n "$DPKG_DEBUG_LEVEL" echo "debug $DPKG_DEBUG_LEVEL" | sudo tee /etc/dpkg/dpkg.cfg.d/cadr-test >/dev/null
+test -n "$DPKG_DEBUG_LEVEL" && echo "debug $DPKG_DEBUG_LEVEL" | sudo tee /etc/dpkg/dpkg.cfg.d/cadr-test >/dev/null
 
-"$test_dir/setup_deb_ln_ask_me.sh" "--internal-test"
+"$test_dir/setup_deb_ln_ask_me.sh" "$upgrade_from" "--internal-test"
 
 preload_config
 sudo mkdir -p /etc/selfhost

tests/data/beta_apt.list

@@ -0,0 +1 @@
+deb https://deb.ln-ask.me/beta buster common local desktop

tests/data/beta_key.gpg

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=KcGD
+-----END PGP PUBLIC KEY BLOCK-----

tests/per-package/bitcoin-regtest/after_install.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+sleep 10
+
+if ps aux | grep -v grep | grep -q 'bitcoind.*-reindex' || sudo journalctl --no-pager -u bitcoin-regtest | grep -q 'Reindexing';
+then
+	echo "Error: unneeded reindex" >&2
+	exit 1
+fi
+
+if gen_addr="$(wget -O - --post-data='{"jsonrpc": "1.0", "id":"curltest0", "method": "getnewaddress", "params": [] }' --header 'content-type: text/plain;' --header 'Authorization: Basic '"`sudo cat /var/run/bitcoin-regtest/cookie | base64 | tr -d '\n'`" "http://127.0.0.1:`sudo grep '^rpcport=' /etc/bitcoin-regtest/bitcoin.conf | sed 's/^rpcport=//' | tr -d '\n'`" | sed 's/^.*"result" *: *"\([^"]*\)".*$/\1/')";
+then
+	echo Generating 150 blocks to address "$gen_addr" >&2
+	if wget -O - --post-data='{"jsonrpc": "1.0", "id":"curltest1", "method": "generatetoaddress", "params": [150, "'"$gen_addr"'"] }' --header 'content-type: text/plain;' --header 'Authorization: Basic '"`sudo cat /var/run/bitcoin-regtest/cookie | base64 | tr -d '\n'`" "http://127.0.0.1:`sudo grep '^rpcport=' /etc/bitcoin-regtest/bitcoin.conf | sed 's/^rpcport=//' | tr -d '\n'`";
+	then
+		echo "Succcess generating 150 blocks" >&2
+	else
+		echo "Failed to generate blocks" >&2
+		exit 1
+	fi
+else
+	echo "Failed to get an address for generating coins" >&2
+	exit 1
+fi

tests/per-package/bitcoin-regtest/after_upgrade.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if ps aux | grep -v grep | grep -q 'bitcoind.*-reindex' || sudo journalctl --no-pager -u bitcoin-regtest | grep -q 'Reindexing';
+then
+	echo "Error: unneeded reindex" >&2
+	exit 1
+fi

tests/setup_deb_ln_ask_me.sh

@@ -8,8 +8,10 @@ test_dir="`dirname "$0"`"
 
 . "$test_dir/common_vars.sh"
 
-sudo cp "$test_data_dir/experimental_apt.list" /etc/apt/sources.list.d/cryptoanarchy-experimental.list
-sudo apt-key add < "$test_data_dir/experimental_key.gpg"
+repo="$1"
+
+sudo cp "$test_data_dir/${repo}_apt.list" /etc/apt/sources.list.d/cryptoanarchy-experimental.list
+sudo apt-key add < "$test_data_dir/${repo}_key.gpg"
 sudo cp "$test_data_dir"/microsoft_apt.list /etc/apt/sources.list.d/microsoft.list
 sudo apt-key add < "$test_data_dir"/microsoft_key.gpg
 sudo apt update