From 76a6ee81bc7a42cedfa6baf0db44f18e005ebfd2 Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Thu, 26 Sep 2019 13:47:10 +0200 Subject: [PATCH 01/15] added hive --- execution-engine/pom.xml | 16 ++++++++++++++++ .../executionenginecloud/Application.java | 6 +++--- proxy-svr/src/main/resources/application.yml | 2 +- webapi/pom.xml | 16 ++++++++++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/execution-engine/pom.xml b/execution-engine/pom.xml index 23629e4..c2dd80d 100644 --- a/execution-engine/pom.xml +++ b/execution-engine/pom.xml @@ -388,6 +388,22 @@ + + hive + + + org.apache.hive + hive-jdbc + 3.1.0 + + + org.eclipse.jetty + * + + + + + diff --git a/execution-engine/src/main/java/com/odysseusinc/arachne/executionenginecloud/Application.java b/execution-engine/src/main/java/com/odysseusinc/arachne/executionenginecloud/Application.java index 9c09b9c..b8e9662 100644 --- a/execution-engine/src/main/java/com/odysseusinc/arachne/executionenginecloud/Application.java +++ b/execution-engine/src/main/java/com/odysseusinc/arachne/executionenginecloud/Application.java @@ -13,10 +13,10 @@ } ) /** - * Note: When using default profile it's required to externalize properties needed to be overriden defaults + * Note: When using default profile it's required to externalize properties needed to be overridden defaults * inherited from execution-engine dependency. At least server.port and server.ssl.enabled - * should be overriden directly by command line arguments or with additional config location. - * This is beacause spring determines properties loading order and external properties has prevalence over + * should be overridden directly by command line arguments or with additional config location. + * This is because spring determines properties loading order and external properties has prevalence over * default application properties. * Not a problem when running in docker container since docker externalize properties with environment variables. */ diff --git a/proxy-svr/src/main/resources/application.yml b/proxy-svr/src/main/resources/application.yml index 5d52a80..dc00d57 100644 --- a/proxy-svr/src/main/resources/application.yml +++ b/proxy-svr/src/main/resources/application.yml @@ -40,7 +40,7 @@ management: zuul: sensitiveHeaders: Cookie,Set-Cookie -ribbon.ReadTimeout: 60000 +ribbon.ReadTimeout: 600000 hystrix: command: diff --git a/webapi/pom.xml b/webapi/pom.xml index 6de1c56..9eb69c2 100644 --- a/webapi/pom.xml +++ b/webapi/pom.xml @@ -158,5 +158,21 @@ + + webapi-hive + + + org.apache.hive + hive-jdbc + 3.1.0 + + + org.eclipse.jetty + * + + + + + \ No newline at end of file From ef8f2ff651140ba80ff8c8ec5d2969e50c58eaa1 Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Wed, 2 Oct 2019 00:45:23 +0200 Subject: [PATCH 02/15] added hive jdbc --- execution-engine/Dockerfile | 2 ++ execution-engine/pom.xml | 33 ++++++++++++++++++++++++++ execution-engine/src/drivers/README.md | 9 ++++++- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/execution-engine/Dockerfile b/execution-engine/Dockerfile index 073c2e1..3cec525 100644 --- a/execution-engine/Dockerfile +++ b/execution-engine/Dockerfile @@ -6,5 +6,7 @@ ARG JAR_FILE ADD target/${JAR_FILE} /usr/share/execution-engine/execution-engine.jar ARG NETEZZA_JDBC ADD ${NETEZZA_JDBC} /netezza/nzjdbc.jar +ARG HIVE_JDBC +COPY ${HIVE_JDBC}/hive-jdbc-standalone.jar /hive/hive-jdbc-standalone.jar ENTRYPOINT ["java", "-jar", "/usr/share/execution-engine/execution-engine.jar"] \ No newline at end of file diff --git a/execution-engine/pom.xml b/execution-engine/pom.xml index c2dd80d..38379ea 100644 --- a/execution-engine/pom.xml +++ b/execution-engine/pom.xml @@ -17,6 +17,7 @@ 1.8 1.15.0-SNAPSHOT src/drivers/README.md + src/drivers/hive @@ -390,6 +391,12 @@ hive + + true + 3.1.0 + + /hive + org.apache.hive @@ -403,6 +410,31 @@ + + + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + + hive-jdbc + initialize + + install-file + + + org.apache.hive + hive-jdbc + ${hive.version} + jar + ${hive.classpath}/hive-jdbc-${hive.version}.jar + + + + + + @@ -431,6 +463,7 @@ ${project.build.finalName}.jar ${netezza.driver.path} + ${hive.driver.path} ${dockerfile.skip} diff --git a/execution-engine/src/drivers/README.md b/execution-engine/src/drivers/README.md index 060e032..bb6c6d0 100644 --- a/execution-engine/src/drivers/README.md +++ b/execution-engine/src/drivers/README.md @@ -3,4 +3,11 @@ with -Dnetezza.driver.path, e.g. ```bash mvn -Dnetezza.driver.path=src/drivers/nzjdbc.jar clean package -``` \ No newline at end of file +``` + +To include Hive driver download it, place here and point to it +with -Dhive.driver.path, e.g. + +```bash +mvn -Dhive.driver.path=src/drivers/hive-jdbc-standalone.jar clean package +``` \ No newline at end of file From 9713feb1ae564503f90e434d500ce5b6294a2527 Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Wed, 2 Oct 2019 01:01:33 +0200 Subject: [PATCH 03/15] updated r docker image --- execution-engine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/execution-engine/Dockerfile b/execution-engine/Dockerfile index 3cec525..5797107 100644 --- a/execution-engine/Dockerfile +++ b/execution-engine/Dockerfile @@ -1,4 +1,4 @@ -FROM odysseusinc/r-env:1.0.7 +FROM odysseusinc/r-env:1.0.11-hive_gs MAINTAINER vitaly.koulakov@odysseusinc.com RUN mkdir /usr/share/execution-engine && mkdir /netezza From e7a626de6633a776bb60bf6abbe17ca33255d58f Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Wed, 2 Oct 2019 17:02:05 +0200 Subject: [PATCH 04/15] updated r docker image and increased hystrix timeout --- execution-engine/Dockerfile | 2 +- proxy-svr/src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/execution-engine/Dockerfile b/execution-engine/Dockerfile index 5797107..7e5907b 100644 --- a/execution-engine/Dockerfile +++ b/execution-engine/Dockerfile @@ -1,4 +1,4 @@ -FROM odysseusinc/r-env:1.0.11-hive_gs +FROM hub.arachnenetwork.com/r-env:1.0.11-hive_gs MAINTAINER vitaly.koulakov@odysseusinc.com RUN mkdir /usr/share/execution-engine && mkdir /netezza diff --git a/proxy-svr/src/main/resources/application.yml b/proxy-svr/src/main/resources/application.yml index dc00d57..b618566 100644 --- a/proxy-svr/src/main/resources/application.yml +++ b/proxy-svr/src/main/resources/application.yml @@ -48,4 +48,4 @@ hystrix: execution: isolation: thread: - timeoutInMilliseconds: 60000 \ No newline at end of file + timeoutInMilliseconds: 600000 \ No newline at end of file From a45112caf5ee73300524be02c049b97bd6109943 Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Fri, 18 Oct 2019 13:46:31 +0200 Subject: [PATCH 05/15] updated profile --- execution-engine/Dockerfile | 1 + execution-engine/pom.xml | 31 -------------------- proxy-svr/src/main/resources/application.yml | 4 +-- webapi/Dockerfile | 2 +- webapi/pom.xml | 2 ++ 5 files changed, 6 insertions(+), 34 deletions(-) diff --git a/execution-engine/Dockerfile b/execution-engine/Dockerfile index 7e5907b..59665f7 100644 --- a/execution-engine/Dockerfile +++ b/execution-engine/Dockerfile @@ -7,6 +7,7 @@ ADD target/${JAR_FILE} /usr/share/execution-engine/execution-engine.jar ARG NETEZZA_JDBC ADD ${NETEZZA_JDBC} /netezza/nzjdbc.jar ARG HIVE_JDBC +# hive-jdbc-standalone contains all necessary dependencies inside it for running queries through hive such as hive-jdbc, hive-common, libthrift, zookeeper, etc. COPY ${HIVE_JDBC}/hive-jdbc-standalone.jar /hive/hive-jdbc-standalone.jar ENTRYPOINT ["java", "-jar", "/usr/share/execution-engine/execution-engine.jar"] \ No newline at end of file diff --git a/execution-engine/pom.xml b/execution-engine/pom.xml index 38379ea..ba89290 100644 --- a/execution-engine/pom.xml +++ b/execution-engine/pom.xml @@ -391,12 +391,6 @@ hive - - true - 3.1.0 - - /hive - org.apache.hive @@ -410,31 +404,6 @@ - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - hive-jdbc - initialize - - install-file - - - org.apache.hive - hive-jdbc - ${hive.version} - jar - ${hive.classpath}/hive-jdbc-${hive.version}.jar - - - - - - diff --git a/proxy-svr/src/main/resources/application.yml b/proxy-svr/src/main/resources/application.yml index b618566..5d52a80 100644 --- a/proxy-svr/src/main/resources/application.yml +++ b/proxy-svr/src/main/resources/application.yml @@ -40,7 +40,7 @@ management: zuul: sensitiveHeaders: Cookie,Set-Cookie -ribbon.ReadTimeout: 600000 +ribbon.ReadTimeout: 60000 hystrix: command: @@ -48,4 +48,4 @@ hystrix: execution: isolation: thread: - timeoutInMilliseconds: 600000 \ No newline at end of file + timeoutInMilliseconds: 60000 \ No newline at end of file diff --git a/webapi/Dockerfile b/webapi/Dockerfile index 204fc09..5b08d2f 100644 --- a/webapi/Dockerfile +++ b/webapi/Dockerfile @@ -1,4 +1,4 @@ -FROM odysseusinc/r-env:1.0.7 +FROM odysseusinc/r-env:1.0.11-hive_gs MAINTAINER vitaly.koulakov@odysseusinc.com RUN mkdir /usr/share/webapi diff --git a/webapi/pom.xml b/webapi/pom.xml index 9eb69c2..f446ab7 100644 --- a/webapi/pom.xml +++ b/webapi/pom.xml @@ -162,6 +162,8 @@ webapi-hive + org.apache.hive hive-jdbc 3.1.0 From 58592757eec0895e73e2b8b3648bd3b4124aafec Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Tue, 29 Oct 2019 13:55:43 +0100 Subject: [PATCH 06/15] updated versions --- atlas-ui/pom.xml | 2 +- webapi/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atlas-ui/pom.xml b/atlas-ui/pom.xml index 9058008..59459bd 100644 --- a/atlas-ui/pom.xml +++ b/atlas-ui/pom.xml @@ -9,7 +9,7 @@ 2.7.3-SNAPSHOT - bcbssc + issue-1168-hive-adding-support 1.4.10 diff --git a/webapi/pom.xml b/webapi/pom.xml index f446ab7..3e2c683 100644 --- a/webapi/pom.xml +++ b/webapi/pom.xml @@ -60,7 +60,7 @@ org.ohdsi WebAPI - 2.7.3 + 2.7.3-SNAPSHOT classes From 12f50b9e5227390dbf90e701f14d6a090f399ba0 Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Tue, 29 Oct 2019 14:55:02 +0100 Subject: [PATCH 07/15] updated versions --- webapi/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapi/Dockerfile b/webapi/Dockerfile index 5b08d2f..9d7b436 100644 --- a/webapi/Dockerfile +++ b/webapi/Dockerfile @@ -1,4 +1,4 @@ -FROM odysseusinc/r-env:1.0.11-hive_gs +FROM hub.arachnenetwork.com/r-env:1.0.11-hive_gs MAINTAINER vitaly.koulakov@odysseusinc.com RUN mkdir /usr/share/webapi From 2ebd4fc25429608639fc6837350d96196d51299d Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Wed, 30 Oct 2019 11:25:32 +0100 Subject: [PATCH 08/15] updated versions --- atlas-ui/pom.xml | 3 ++- execution-engine/Dockerfile | 2 +- webapi/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/atlas-ui/pom.xml b/atlas-ui/pom.xml index 59459bd..58470a6 100644 --- a/atlas-ui/pom.xml +++ b/atlas-ui/pom.xml @@ -9,7 +9,7 @@ 2.7.3-SNAPSHOT - issue-1168-hive-adding-support + bcbssc 1.4.10 @@ -141,6 +141,7 @@ odysseusinc/${project.artifactId} ${project.version} + hive_gs ${dockerfile.skip} diff --git a/execution-engine/Dockerfile b/execution-engine/Dockerfile index 59665f7..d365b3d 100644 --- a/execution-engine/Dockerfile +++ b/execution-engine/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.arachnenetwork.com/r-env:1.0.11-hive_gs +FROM odysseusinc/r-env:1.0.12-hive_gs MAINTAINER vitaly.koulakov@odysseusinc.com RUN mkdir /usr/share/execution-engine && mkdir /netezza diff --git a/webapi/Dockerfile b/webapi/Dockerfile index 9d7b436..5080283 100644 --- a/webapi/Dockerfile +++ b/webapi/Dockerfile @@ -1,4 +1,4 @@ -FROM hub.arachnenetwork.com/r-env:1.0.11-hive_gs +FROM odysseusinc/r-env:1.0.12-hive_gs MAINTAINER vitaly.koulakov@odysseusinc.com RUN mkdir /usr/share/webapi From 9c07503d7e72acddf1d21ffd3ecc266185cf1096 Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Wed, 30 Oct 2019 11:26:42 +0100 Subject: [PATCH 09/15] updated versions --- atlas-ui/pom.xml | 1 - webapi/pom.xml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/atlas-ui/pom.xml b/atlas-ui/pom.xml index 58470a6..9058008 100644 --- a/atlas-ui/pom.xml +++ b/atlas-ui/pom.xml @@ -141,7 +141,6 @@ odysseusinc/${project.artifactId} ${project.version} - hive_gs ${dockerfile.skip} diff --git a/webapi/pom.xml b/webapi/pom.xml index 3e2c683..d493de9 100644 --- a/webapi/pom.xml +++ b/webapi/pom.xml @@ -136,6 +136,7 @@ odysseusinc/${project.artifactId} ${project.version} + hive_gs ${project.build.finalName}.jar From d04e3fc5e220f53d6826eff7a12d59cfd87e3e6c Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Wed, 30 Oct 2019 11:27:25 +0100 Subject: [PATCH 10/15] updated versions --- webapi/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/webapi/pom.xml b/webapi/pom.xml index d493de9..3e2c683 100644 --- a/webapi/pom.xml +++ b/webapi/pom.xml @@ -136,7 +136,6 @@ odysseusinc/${project.artifactId} ${project.version} - hive_gs ${project.build.finalName}.jar From e17538a30ccb9a1cc1c6f5781d75de01df8c89be Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Tue, 17 Mar 2020 18:02:41 +0100 Subject: [PATCH 11/15] updated Execution Engine version --- execution-engine/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/execution-engine/pom.xml b/execution-engine/pom.xml index ba89290..6f6f576 100644 --- a/execution-engine/pom.xml +++ b/execution-engine/pom.xml @@ -15,7 +15,7 @@ 1.8 - 1.15.0-SNAPSHOT + 1.16.0-SNAPSHOT src/drivers/README.md src/drivers/hive From 0337c926dd8b78e31a2fe4494c01fbdf90afbd72 Mon Sep 17 00:00:00 2001 From: Anastasiia Klochkova Date: Wed, 18 Mar 2020 13:56:08 +0100 Subject: [PATCH 12/15] updated r-env version --- execution-engine/Dockerfile | 2 +- webapi/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/execution-engine/Dockerfile b/execution-engine/Dockerfile index d365b3d..637249d 100644 --- a/execution-engine/Dockerfile +++ b/execution-engine/Dockerfile @@ -1,4 +1,4 @@ -FROM odysseusinc/r-env:1.0.12-hive_gs +FROM odysseusinc/r-env:1.0.12 MAINTAINER vitaly.koulakov@odysseusinc.com RUN mkdir /usr/share/execution-engine && mkdir /netezza diff --git a/webapi/Dockerfile b/webapi/Dockerfile index 5080283..79d61cf 100644 --- a/webapi/Dockerfile +++ b/webapi/Dockerfile @@ -1,4 +1,4 @@ -FROM odysseusinc/r-env:1.0.12-hive_gs +FROM odysseusinc/r-env:1.0.12 MAINTAINER vitaly.koulakov@odysseusinc.com RUN mkdir /usr/share/webapi From 38626b481c18c2fc1b895b8e00ae90d8b142d712 Mon Sep 17 00:00:00 2001 From: konstjar Date: Tue, 24 Aug 2021 16:27:10 +0200 Subject: [PATCH 13/15] Nginx 1.21.1 --- atlas-ui/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atlas-ui/Dockerfile b/atlas-ui/Dockerfile index 33fc0e3..a4d0667 100644 --- a/atlas-ui/Dockerfile +++ b/atlas-ui/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.17.1 +FROM nginx:1.21.1 MAINTAINER vitaly.koulakov@odysseusinc.com RUN apt-get -q update && DEBIAN_FRONTEND=noninteractive apt-get -yq install unzip @@ -6,4 +6,4 @@ RUN apt-get -q update && DEBIAN_FRONTEND=noninteractive apt-get -yq install unzi COPY target/atlasui.zip atlasui.zip RUN rm -f /usr/share/nginx/html/index.html \ && unzip -qq atlasui.zip -d /usr/share/nginx/html && rm -f atlasui.zip -COPY config-local.js /usr/share/nginx/html/js \ No newline at end of file +COPY config-local.js /usr/share/nginx/html/js From a0dd04cf42b631a10ef54fcef4594be95e9d832f Mon Sep 17 00:00:00 2001 From: konstjar Date: Tue, 24 Aug 2021 17:19:24 +0200 Subject: [PATCH 14/15] Skip webapi build because of Jenkins issue --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 98b5d72..627bcb6 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ execution-engine proxy-svr service-discovery-svr - webapi + atlas-ui @@ -40,4 +40,4 @@ - \ No newline at end of file + From 8e1e6fe2a077d441f1e953ffd8dead2e8d55011d Mon Sep 17 00:00:00 2001 From: konstjar Date: Tue, 24 Aug 2021 17:27:04 +0200 Subject: [PATCH 15/15] Atlas UI with correct branch --- atlas-ui/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atlas-ui/pom.xml b/atlas-ui/pom.xml index 9058008..b011d41 100644 --- a/atlas-ui/pom.xml +++ b/atlas-ui/pom.xml @@ -9,7 +9,7 @@ 2.7.3-SNAPSHOT - bcbssc + issue-1168-hive-adding-support 1.4.10 @@ -147,4 +147,4 @@ - \ No newline at end of file +