Skip to content

Commit

Permalink
Merge d6d75ad into 680c83f
Browse files Browse the repository at this point in the history
  • Loading branch information
@donhardman
donhardman committed May 22, 2024
2 parents 680c83f + d6d75ad commit fa947f1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions tests/backup-restore-ok.rec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ manticore-backup --backup-dir=/tmp --restore=backup-111
Copyright (c) %{YEAR}-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
Manticore config file:
Backup dir: /tmp
%{DATETIME} [Info] Stored versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","secondary":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","knn":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","buddy":"%{SEMVER}"}
%{DATETIME} [Info] Current versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","secondary":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","knn":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","buddy":"0.0.0"}
%{DATETIME} [Info] Stored versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} %{COMMITDATE}","secondary":"%{SEMVER} %{COMMITDATE}","knn":"%{SEMVER} %{COMMITDATE}","buddy":"%{SEMVER}"}
%{DATETIME} [Info] Current versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} %{COMMITDATE}","secondary":"%{SEMVER} %{COMMITDATE}","knn":"%{SEMVER} %{COMMITDATE}","buddy":"0.0.0"}
%{DATETIME} [Info] Starting to restore...
%{DATETIME} [Error] Cannot initiate the restore process due to searchd daemon is running.
––– input –––
Expand All @@ -85,8 +85,8 @@ manticore-backup --backup-dir=/tmp --restore=backup-111
Copyright (c) %{YEAR}-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
Manticore config file:
Backup dir: /tmp
%{DATETIME} [Info] Stored versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","secondary":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","knn":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","buddy":"%{SEMVER}"}
%{DATETIME} [Info] Current versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","secondary":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","knn":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","buddy":"0.0.0"}
%{DATETIME} [Info] Stored versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} %{COMMITDATE}","secondary":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","knn":"%{SEMVER} %{COMMITDATE}","buddy":"%{SEMVER}"}
%{DATETIME} [Info] Current versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} %{COMMITDATE}","secondary":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","knn":"%{SEMVER} %{COMMITDATE}","buddy":"0.0.0"}
%{DATETIME} [Info] Starting to restore...
Manticore config
endpoint = http://%{IPADDR}:9312
Expand All @@ -100,8 +100,8 @@ manticore-backup --backup-dir=/tmp --restore=backup-111
Copyright (c) %{YEAR}-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
Manticore config file:
Backup dir: /tmp
%{DATETIME} [Info] Stored versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","secondary":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","knn":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","buddy":"%{SEMVER}"}
%{DATETIME} [Info] Current versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","secondary":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","knn":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","buddy":"0.0.0"}
%{DATETIME} [Info] Stored versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} %{COMMITDATE}","secondary":"%{SEMVER} %{COMMITDATE}","knn":"%{SEMVER} %{COMMITDATE}","buddy":"%{SEMVER}"}
%{DATETIME} [Info] Current versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} %{COMMITDATE}","secondary":"%{SEMVER} %{COMMITDATE}","knn":"%{SEMVER} %{COMMITDATE}","buddy":"0.0.0"}
%{DATETIME} [Info] Starting to restore...
Manticore config
endpoint = http://%{IPADDR}:9312
Expand All @@ -115,8 +115,8 @@ manticore-backup --backup-dir=/tmp --restore=backup-111
Copyright (c) %{YEAR}-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
Manticore config file:
Backup dir: /tmp
%{DATETIME} [Info] Stored versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","secondary":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","knn":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","buddy":"%{SEMVER}"}
%{DATETIME} [Info] Current versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","secondary":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","knn":"%{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#","buddy":"0.0.0"}
%{DATETIME} [Info] Stored versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} %{COMMITDATE}","secondary":"%{SEMVER} %{COMMITDATE}","buddy":"%{SEMVER}"}
%{DATETIME} [Info] Current versions: {"backup":"%{SEMVER}","manticore":"%{SEMVER} %{COMMITDATE} dev","columnar":"%{SEMVER} %{COMMITDATE}","secondary":"%{SEMVER} %{COMMITDATE}","knn":"%{SEMVER} %{COMMITDATE}","buddy":"0.0.0"}
%{DATETIME} [Info] Starting to restore...
Manticore config
endpoint = http://%{IPADDR}:9312
Expand All @@ -132,7 +132,7 @@ endpoint = http://%{IPADDR}:9312
––– input –––
searchd
––– output –––
Manticore %{SEMVER} %{COMMITDATE} dev (columnar %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#) (secondary %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#) (knn %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#)
Manticore %{SEMVER} %{COMMITDATE} dev (columnar %{SEMVER} %{COMMITDATE}) (secondary %{SEMVER} %{COMMITDATE}) (knn %{SEMVER} %{COMMITDATE})
Copyright (c) 2001-2016, Andrew Aksyonoff
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
Expand Down
2 changes: 1 addition & 1 deletion tests/backup-shebang-config-ok.rec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cp tests/config/manticore.sh /etc/manticoresearch/manticore.conf
––– input –––
searchd
––– output –––
Manticore %{SEMVER} %{COMMITDATE} dev (columnar %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#) (secondary %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#) (knn %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#)
Manticore %{SEMVER} %{COMMITDATE} dev (columnar %{SEMVER} %{COMMITDATE}) (secondary %{SEMVER} %{COMMITDATE}) (knn %{SEMVER} %{COMMITDATE})
Copyright (c) 2001-2016, Andrew Aksyonoff
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
Expand Down
2 changes: 1 addition & 1 deletion tests/backup-works-with-max-connections.rec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cp tests/config/manticore-vip.conf /etc/manticoresearch/manticore.conf
––– input –––
searchd
––– output –––
Manticore %{SEMVER} %{COMMITDATE} dev (columnar %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#) (secondary %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#) (knn %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#)
Manticore %{SEMVER} %{COMMITDATE} dev (columnar %{SEMVER} %{COMMITDATE}) (secondary %{SEMVER} %{COMMITDATE}) (knn %{SEMVER} %{COMMITDATE})
Copyright (c) 2001-2016, Andrew Aksyonoff
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
Expand Down
2 changes: 1 addition & 1 deletion tests/start-searchd.recb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cp ./tests/config/manticore.conf /etc/manticoresearch/manticore.conf
––– input –––
searchd
––– output –––
Manticore %{SEMVER} %{COMMITDATE} dev (columnar %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#) (secondary %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#) (knn %{SEMVER} #!/[a-f0-9]{7}@[0-9]{6}/!#)
Manticore %{SEMVER} %{COMMITDATE} dev (columnar %{SEMVER} %{COMMITDATE}) (secondary %{SEMVER} %{COMMITDATE}) (knn %{SEMVER} %{COMMITDATE})
Copyright (c) 2001-2016, Andrew Aksyonoff
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
Expand Down

0 comments on commit fa947f1

Please sign in to comment.