fix TestRestoreDistributedCluster for 20.3, try rollback to musl.cc in Dockerfile

Signed-off-by: Slach <[email protected]>

Author: Slach

Dockerfile

@@ -19,10 +19,10 @@ RUN rm -fv /etc/apt/sources.list.d/clickhouse.list && \
 # todo ugly fix for ugly fix, musl.cc is not available from github runner \
     DISTRIB_RELEASE=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d "=" -f 2) && \
     echo ${DISTRIB_RELEASE} && \
-    wget -nv -O /tmp/megacmd.deb https://mega.nz/linux/repo/xUbuntu_${DISTRIB_RELEASE}/amd64/megacmd-xUbuntu_${DISTRIB_RELEASE}_amd64.deb && \
-    apt install -y "/tmp/megacmd.deb" && \
-    mega-get https://mega.nz/file/zQwVHSYb#8WqqMUCTbbEVKDW55NPrRnM2-4SC-numNCLDKoTWtwQ /root/ && \
-#    wget -nv -P /root/ https://musl.cc/aarch64-linux-musl-cross.tgz && \
+#    wget -nv -O /tmp/megacmd.deb https://mega.nz/linux/repo/xUbuntu_${DISTRIB_RELEASE}/amd64/megacmd-xUbuntu_${DISTRIB_RELEASE}_amd64.deb && \
+#    apt install -y "/tmp/megacmd.deb" && \
+#    mega-get https://mega.nz/file/zQwVHSYb#8WqqMUCTbbEVKDW55NPrRnM2-4SC-numNCLDKoTWtwQ /root/ && \
+    wget -nv -P /root/ https://musl.cc/aarch64-linux-musl-cross.tgz && \
     tar -xvf /root/aarch64-linux-musl-cross.tgz -C /root/ && \
     mkdir -p /root/go/
 

test/integration/integration_test.go

@@ -2921,6 +2921,7 @@ func TestRestoreDistributedCluster(t *testing.T) {
 
 	// remove cluster and wait configuration reload
 	env.DockerExecNoError(r, "clickhouse", "bash", "-c", "rm -rfv /etc/clickhouse-server/config.d/new-cluster.xml")
+	env.queryWithNoError(r, "SYSTEM RELOAD CONFIG")
 	newClusterExists := uint64(1)
 	for i := 0; i < 60 && newClusterExists == 1; i++ {
 		r.NoError(env.ch.SelectSingleRowNoCtx(&newClusterExists, "SELECT count() FROM system.clusters WHERE cluster='new_cluster'"))