Bladeren bron

feat: Updated Buddy logic to handle requests from latest logstash/beats

This bumps buddy version from 3.27.3 to 3.28.0.
Related issue https://github.com/manticoresoftware/manticoresearch/issues/2400
Related PR https://github.com/manticoresoftware/manticoresearch-buddy/pull/532/

---------

Co-authored-by: githubmanticore <[email protected]>
Co-authored-by: Don Hardman <[email protected]>
Manticore Team 9 maanden geleden
bovenliggende
commit
524b8734bb

+ 1 - 1
deps.txt

@@ -1,5 +1,5 @@
 backup 1.9.1+25040420-c6e46da2-dev
-buddy 3.27.3+25041621-d40ff5f3-dev
+buddy 3.28.0+25050619-ba0b7452-dev
 mcl 4.2.1 25032818 aeac3b3
 executor 1.3.1 25011510 1856ac9
 tzdata 1.0.1 240904 3ba592a

+ 1 - 1
test/clt-tests/base/replication/start-searchd-precach.recb

@@ -5,6 +5,6 @@ mkdir -p /var/{run,lib,log}/manticore-${INSTANCE}
 stdbuf -oL searchd -c test/clt-tests/base/searchd-with-flexible-ports.conf > /dev/null
 ––– output –––
 ––– input –––
-if timeout 10 grep -qm1 '\[BUDDY\] started' <(tail -n 1000 -f /var/log/manticore-${INSTANCE}/searchd.log); then echo 'Buddy started!'; else echo 'Timeout or failed!'; cat /var/log/manticore-${INSTANCE}/searchd.log; exit 1; fi
+if timeout 10 grep -qm1 '\[BUDDY\] started' <(tail -n 1000 -f /var/log/manticore-${INSTANCE}/searchd.log); then echo 'Buddy started!'; else echo 'Timeout or failed!'; cat /var/log/manticore-${INSTANCE}/searchd.log; fi
 ––– output –––
 Buddy started!

+ 34 - 0
test/clt-tests/core/test-truncate-distributed-table.rec

@@ -0,0 +1,34 @@
+––– input –––
+export INSTANCE=1
+––– output –––
+––– block: ../base/replication/start-searchd-precach –––
+––– input –––
+export INSTANCE=2
+––– output –––
+––– block: ../base/replication/start-searchd-precach –––
+––– input –––
+mysql -h0 -P1306 -e "
+CREATE TABLE t1 (title TEXT, content TEXT);
+INSERT INTO t1 (title, content) VALUES ('Local Title 1', 'Local Content 1'), ('Local Title 2', 'Local Content 2');
+"
+––– output –––
+––– input –––
+mysql -h0 -P2306 -e "
+CREATE TABLE t2 (title TEXT, content TEXT);
+INSERT INTO t2 (title, content) VALUES ('Local Title 3', 'Local Content 3'), ('Local Title 4', 'Local Content 4');
+"
+––– output –––
+––– input –––
+mysql -h0 -P1306 -e " CREATE TABLE dist_table type='distributed' local='t1' agent='127.0.0.1:2312:t2' "
+––– output –––
+––– input –––
+mysql -h0 -P1306 -e "SELECT COUNT(*) FROM dist_table\G" | grep count
+––– output –––
+count(*): 4
+––– input –––
+mysql -h0 -P1306 -e "TRUNCATE TABLE dist_table"
+––– output –––
+––– input –––
+mysql -h0 -P1306 -e "SELECT COUNT(*) FROM dist_table\G" | grep count
+––– output –––
+count(*): 0