diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | dist/post_install.sh | 4 | ||||
| -rw-r--r-- | docker/Dockerfile.build | 33 | ||||
| -rwxr-xr-x | docker/build-vespa-internal.sh | 1 | ||||
| -rwxr-xr-x | docker/vespa-ci-internal.sh | 3 | ||||
| -rw-r--r-- | sample-apps/http-api-using-searcher/src/main/application/hosts.xml | 6 | ||||
| -rw-r--r-- | sample-apps/http-api-using-searcher/src/main/application/services.xml | 27 | ||||
| -rw-r--r-- | searchcore/src/apps/fdispatch/.gitignore | 2 | ||||
| -rw-r--r-- | searchcore/src/apps/fdispatch/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespabase/CMakeLists.txt | 2 |
10 files changed, 23 insertions, 59 deletions
diff --git a/README.md b/README.md index 459f1637ac7..0ff25ce4ee3 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Java modules can be built on any environment having Java and Maven: -DCMAKE_BUILD_RPATH=/opt/vespa/lib64 \ <sourcedir> make - make test + ctest3 ### Create RPM packages sh dist.sh VERSION && rpmbuild -ba ~/rpmbuild/SPECS/vespa-VERSION.spec diff --git a/dist/post_install.sh b/dist/post_install.sh index 094a96fa2ef..0fa78e4d687 100755 --- a/dist/post_install.sh +++ b/dist/post_install.sh @@ -86,10 +86,10 @@ ln -s vespa-makefsa $INSTALLPATH/bin/makefsa # Temporary when renaming binaries in searchcore ln -s vespa-proton-bin $INSTALLPATH/sbin/proton-bin -ln -s vespa-fdispatch-bin $INSTALLPATH/sbin/fdispatch-bin +ln -s vespa-dispatch-bin $INSTALLPATH/sbin/fdispatch-bin ln -s vespa-verify-ranksetup-bin $INSTALLPATH/bin/verify_ranksetup-bin ln -s vespa-proton $INSTALLPATH/sbin/proton -ln -s vespa-fdispatch $INSTALLPATH/sbin/fdispatch +ln -s vespa-dispatch $INSTALLPATH/sbin/fdispatch ln -s vespa-verify-ranksetup $INSTALLPATH/bin/verify_ranksetup # Temporary when renaming binaries in storageserver diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index da3d535978d..1e89ce87bcb 100644 --- a/docker/Dockerfile.build +++ b/docker/Dockerfile.build @@ -5,39 +5,10 @@ FROM centos:7 RUN yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo && \ yum -y install epel-release && \ yum -y install centos-release-scl && \ - yum -y --enablerepo=epel-testing install \ - devtoolset-6-gcc-c++ \ - devtoolset-6-libatomic-devel \ - devtoolset-6-binutils \ - git \ - make \ - cmake3 \ + yum -y install git \ ccache \ - Judy-devel \ - lz4-devel \ - libzstd-devel \ - zlib-devel \ - maven \ - libicu-devel \ - llvm3.9-devel \ - llvm3.9-static \ - java-1.8.0-openjdk-devel \ - openssl \ - openssl-devel \ rpm-build \ - perl \ - perl-Env \ - perl-JSON \ - perl-IO-Socket-IP \ - perl-Data-Dumper \ - perl-libwww-perl \ - perl-Net-INET6Glue \ - perl-URI \ - sudo \ - vespa-boost-devel \ - vespa-libtorrent-devel \ - vespa-zookeeper-c-client-devel \ - vespa-cppunit-devel && \ + sudo && \ echo "source /opt/rh/devtoolset-6/enable" > /etc/profile.d/devtoolset-6.sh && \ echo "* soft nproc 32768" > /etc/security/limits.d/90-nproc.conf diff --git a/docker/build-vespa-internal.sh b/docker/build-vespa-internal.sh index 9da687a2e00..d2216b049ca 100755 --- a/docker/build-vespa-internal.sh +++ b/docker/build-vespa-internal.sh @@ -13,6 +13,7 @@ CALLER_GID=$3 cd /vespa ./dist.sh ${VESPA_VERSION} +yum-builddep -y ~/rpmbuild/SPECS/vespa-${VESPA_VERSION}.spec rpmbuild -bb ~/rpmbuild/SPECS/vespa-${VESPA_VERSION}.spec chown ${CALLER_UID}:${CALLER_GID} ~/rpmbuild/RPMS/x86_64/*.rpm mv ~/rpmbuild/RPMS/x86_64/*.rpm /vespa/docker diff --git a/docker/vespa-ci-internal.sh b/docker/vespa-ci-internal.sh index c8d9f3d2508..40df09c40d2 100755 --- a/docker/vespa-ci-internal.sh +++ b/docker/vespa-ci-internal.sh @@ -20,6 +20,7 @@ mkdir "${BUILD_DIR}" git clone --no-checkout --local --no-hardlinks file:///vespa "${SOURCE_DIR}" cd "${SOURCE_DIR}" git checkout --detach ${GIT_COMMIT} +yum-builddep -y ./dist/vespa.spec source /opt/rh/devtoolset-6/enable || true sh ./bootstrap.sh full MAVEN_OPTS="-Xms512m -Xmx512m" mvn install @@ -32,4 +33,4 @@ cmake3 -DCMAKE_INSTALL_PREFIX=/opt/vespa \ -DCMAKE_BUILD_RPATH=/opt/vespa/lib64 \ "${SOURCE_DIR}" make -j ${NUM_THREADS} -make -j ${NUM_THREADS} test +ctest3 -j ${NUM_THREADS} diff --git a/sample-apps/http-api-using-searcher/src/main/application/hosts.xml b/sample-apps/http-api-using-searcher/src/main/application/hosts.xml new file mode 100644 index 00000000000..8fa51b58ae4 --- /dev/null +++ b/sample-apps/http-api-using-searcher/src/main/application/hosts.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" ?> +<hosts> + <host name="localhost"> + <alias>node1</alias> + </host> +</hosts> diff --git a/sample-apps/http-api-using-searcher/src/main/application/services.xml b/sample-apps/http-api-using-searcher/src/main/application/services.xml index 7db4a8c8c93..e879c3d4595 100644 --- a/sample-apps/http-api-using-searcher/src/main/application/services.xml +++ b/sample-apps/http-api-using-searcher/src/main/application/services.xml @@ -1,17 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> - <admin version="2.0"> - <adminserver hostalias="node1"/> - </admin> <container id="default" version="1.0"> - <document-api /> <!-- Enable feed endpoint --> - <search> <chain inherits="vespa" id="default"> - <searcher id="com.yahoo.demo.DemoSearcher" bundle="demo"> + <searcher id="com.yahoo.demo.DemoSearcher" bundle="sample-app-http-api-searcher"> <config name="demo.demo"> <demo> <item> @@ -21,15 +16,12 @@ </config> </searcher> </chain> - <renderer id="demo" class="com.yahoo.demo.DemoRenderer" bundle="demo" /> + <renderer id="demo" class="com.yahoo.demo.DemoRenderer" bundle="sample-app-http-api-searcher"/> </search> - - <handler id="com.yahoo.demo.DemoHandler" bundle="demo"> + <handler id="com.yahoo.demo.DemoHandler" bundle="sample-app-http-api-searcher"> <binding>http://*:8080/demo</binding> </handler> - - <component id="com.yahoo.demo.DemoComponent" bundle="demo"/> - + <component id="com.yahoo.demo.DemoComponent" bundle="sample-app-http-api-searcher"/> <nodes> <node hostalias="node1"/> </nodes> @@ -40,16 +32,9 @@ <documents> <document mode="index" type="basic"/> </documents> - - <group name="mygroup" distribution-key="0"> + <nodes> <node distribution-key="0" hostalias="node1"/> - </group> - - <engine> - <proton> - <searchable-copies>1</searchable-copies> - </proton> - </engine> + </nodes> </content> </services> diff --git a/searchcore/src/apps/fdispatch/.gitignore b/searchcore/src/apps/fdispatch/.gitignore index 6cb8d53bdc1..36a9a584d01 100644 --- a/searchcore/src/apps/fdispatch/.gitignore +++ b/searchcore/src/apps/fdispatch/.gitignore @@ -1 +1 @@ -vespa-fdispatch-bin +vespa-dispatch-bin diff --git a/searchcore/src/apps/fdispatch/CMakeLists.txt b/searchcore/src/apps/fdispatch/CMakeLists.txt index fcb489d6398..4399968a761 100644 --- a/searchcore/src/apps/fdispatch/CMakeLists.txt +++ b/searchcore/src/apps/fdispatch/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_executable(searchcore_fdispatch_app SOURCES fdispatch.cpp - OUTPUT_NAME vespa-fdispatch-bin + OUTPUT_NAME vespa-dispatch-bin INSTALL sbin DEPENDS searchcore_fdispatch_program diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index b455eca8671..e658a959d84 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -10,7 +10,7 @@ vespa_install_script(src/start-cbinaries.sh vespa-route bin) vespa_install_script(src/start-cbinaries.sh vespa-transactionlog-inspect bin) vespa_install_script(src/start-cbinaries.sh vespa-vds-disktool bin) vespa_install_script(src/start-cbinaries.sh vespa-distributord sbin) -vespa_install_script(src/start-cbinaries.sh vespa-fdispatch sbin) +vespa_install_script(src/start-cbinaries.sh vespa-dispatch sbin) vespa_install_script(src/start-cbinaries.sh vespa-filedistributor sbin) vespa_install_script(src/start-cbinaries.sh vespa-proton sbin) vespa_install_script(src/start-cbinaries.sh vespa-storaged sbin) |