From 55ba86a8647e96561f91ebe64b691b206942c0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Wed, 27 May 2020 11:53:19 +0200
Subject: [PATCH] reindex.sh: fix paths for cloning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 elasticsearch/reindex.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/elasticsearch/reindex.sh b/elasticsearch/reindex.sh
index 31152b4..3f2309a 100755
--- a/elasticsearch/reindex.sh
+++ b/elasticsearch/reindex.sh
@@ -7,9 +7,9 @@ function queryAPI() {
   method=$1
   path=$2
   data=$3
-  cmd="curl -s -X${method} http://localhost:9200/${path}"
+  cmd="curl -f -s -X${method} http://localhost:9200/${path}"
   if [[ -n "${data}" ]]; then
-    cmd+=" -f -H 'content-type:application/json' -d '${data}'"
+    cmd+=" -H 'content-type:application/json' -d '${data}'"
   fi
   eval "${cmd}"
 }
@@ -23,15 +23,15 @@ function reindex() {
 }
 
 function clone() {
-  queryAPI POST "/${1}/_clone/${2}" '{"settings":{"index.blocks.write":null}}'
+  queryAPI POST "${1}/_clone/${2}" '{"settings":{"index.blocks.write":null}}'
 }
 
 function read_only() {
-  queryAPI PUT "/${1}/_settings" '{"settings":{"index.blocks.write":"true"}}'
+  queryAPI PUT "${1}/_settings" '{"settings":{"index.blocks.write":"true"}}'
 }
 
 function wait_green() {
-  queryAPI GET "/_cluster/health/${1}?wait_for_status=green&timeout=9000s"
+  queryAPI GET "_cluster/health/${1}?wait_for_status=green&timeout=9000s"
 }
 
 function delete() {
@@ -71,8 +71,9 @@ echo "! Deleting: ${old}"
 delete "${old}" > /dev/null
 echo "+ Cloning: ${new} -> ${old}"
 read_only "${new}" > /dev/null
-clone "${new}" "${old}" > /dev/null
-wait_green "${old}"
+clone "${new}" "${old}"
+echo "+ Waiting: ${old}"
+wait_green "${old}" > /dev/null
 echo "? $(printf '%-21s' ${old}) - Count: $(docs_count ${old})"
 echo "? $(printf '%-21s' ${old}) - Size: $(size_in_bytes ${old}) MB"
 echo "! Deleting: ${new}"