Skip to content

Fix/elastic store update #5210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
+86 −62
Open

Fix/elastic store update #5210

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
75318f0
updated elastic4s to support 7.10.x
dylanturn Apr 4, 2022
f3690a0
removed comments
dylanturn Apr 4, 2022
a2dacf7
adding gradle workflow
dylanturn Apr 4, 2022
23bb9df
no idea what im doing
dylanturn Apr 4, 2022
be2c101
updated the elastic search activation store plugin
dylanturn Apr 4, 2022
5707726
added back an import that i guess we needed?
dylanturn Apr 4, 2022
51e8ab2
try get these images into a repo
dylanturn Apr 4, 2022
3799f49
trying to get image pushing to work without tricks
dylanturn Apr 4, 2022
4d1090d
undid change to dockerhub.groovy
dylanturn Apr 4, 2022
08fc4a3
configure the action to run manually
dylanturn Apr 5, 2022
f50c70d
added space
dylanturn Apr 5, 2022
cc08255
trying to get this workflow_dispatch to work
dylanturn Apr 5, 2022
d309986
updated the ElasticSearchDurationCheckerTests test
dylanturn Apr 12, 2022
0676879
update the MemoryQueueFlowTests elastic4s searches import
dylanturn Apr 12, 2022
ab12b5b
made some changes to fix the test
dylanturn Apr 12, 2022
a742486
updated an elastic import to fix a test
dylanturn Apr 12, 2022
74b14c5
removed ambiguous import
dylanturn Apr 12, 2022
97734cb
trying to fix a test
dylanturn Apr 12, 2022
db8bad0
somehow fixed the test
dylanturn Apr 12, 2022
87b3dbd
Merge pull request #1 from dylanturn/fix/elastic-store-update-tests
dylanturn Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adding gradle workflow
  • Loading branch information
@dylanturn
dylanturn committed Apr 4, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit a2dacf7c02b546df1def0e59fe6c593ca0826def
26 changes: 26 additions & 0 deletions .github/workflows/gradle-build.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This workflow uses actions that are not certified by GitHub.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the goal here to run GHA instead of using Travis?
In any case this change seems orthogonal to the rest of the PR.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created that because I don't have a Travis or Jenkins environment to build this in and my personal laptop has an M1 chip in it. Additionally, I wanted to be sure that I had fixed the issue before I submitted the PR but left it in because I felt it could be beneficial to others who might want to build the project but don't have much Jenkins, Travis, or Gradle experience.

The action only runs when triggered manually.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are some unittests for es in tests/src/test/scala/org/apache/openwhisk/core/database/elasticsearch/ElasticSearchActivationStoreTests.scala which is using testcontainers, so I think you can use it to run tests on your laptop?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It failed when trying to download one of the dependencies. I'll try again so I can get the dependency name.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a quick update, I tried to build the project locally again and got the following error:

Execution failed for task ':core:scheduler:generateProto'.
> Could not resolve all files for configuration ':core:scheduler:protobufToolsLocator_protoc'.
   > Could not find protoc-osx-aarch_64.exe (com.google.protobuf:protoc:3.4.0).
     Searched in the following locations:
         https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/3.4.0/protoc-3.4.0-osx-aarch_64.exe

I must admit, this is my first time with Scala and Gradle, and while I think I might know what happened, I'm still trying to work out how to go about fixing it.

# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI

on: [push]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
- name: Build with Gradle
uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
with:
arguments: build
2 changes: 1 addition & 1 deletion ...scala/org/apache/openwhisk/core/database/elasticsearch/ElasticSearchActivationStore.scala
View file
Original file line number Diff line number Diff line change
@@ -183,7 +183,7 @@ class ElasticSearchActivationStore(
}
.map { res =>
if (res.status == StatusCodes.OK.intValue) {
if (res.result.hits.total == 0) {
if (res.result.hits.total.value == 0) {
transid.finished(this, start, s"[GET] 'activations', document: '$activationId'; not found.")
throw NoDocumentException("not found on 'get'")
} else {
2 changes: 1 addition & 1 deletion tools/macos/README.md
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ brew install gnu-tar
# install pip
sudo easy_install pip
# install script prerequisites
pip install docker==5.0.0 ansible==4.1.0 jinja2==3.0.1 couchdb==1.2 httplib2==0.19.1 requests==2.25.1 six=1.16.0
pip install docker==5.0.0 ansible==4.1.0 jinja2==3.0.1 couchdb==1.2 httplib2==0.19.1 requests==2.25.1 six==1.16.0
```

Make sure you correctly configure the environment variable $JAVA_HOME.