Skip to content
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.

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

Add changes for release v2.10 #478

Merged
merged 1 commit into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Java CI

on:
push:
branches:
on:
push:
branches:
- "*"

pull_request:
branches:
branches:
- "*"

jobs:
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: opensearch-project/performance-analyzer
ref: 2.x
ref: 2.10
path: ./tmp/performance-analyzer
- name: Build PA gradle using the new RCA jar
working-directory: ./tmp/performance-analyzer
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ This package uses the [Gradle](https://docs.gradle.org/current/userguide/usergui

2. Clone the Performance Analyzer plugin repository as follows:

`git clone -b 2.9 --single-branch https://github.com/opensearch-project/performance-analyzer.git`
`git clone -b 2.10 --single-branch https://github.com/opensearch-project/performance-analyzer.git`

3. `cd performance-analyzer`

Expand Down Expand Up @@ -114,7 +114,7 @@ You can use the packaged Dockerfile and docker-compose.yml files [here](./docker

2. Build and tag the Docker image with our RCA framework.

`docker build -t opensearch/pa-rca:2.9 .`
`docker build -t opensearch/pa-rca:2.10 .`

3. Spin up a two node cluster as follows:

Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
buildDockerJdkVersion = System.getProperty("build.docker_jdk_ver", "11")

// 2.9.0-SNAPSHOT -> 2.9.0.0-SNAPSHOT
// 2.10.0-SNAPSHOT -> 2.10.0.0-SNAPSHOT
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'
if (buildVersionQualifier) {
Expand All @@ -20,7 +20,7 @@ buildscript {
if (isSnapshot) {
opensearch_build += "-SNAPSHOT"
}
gitPaBranch = '2.9'
gitPaBranch = '2.10'
gitPaRepo = "https://github.com/opensearch-project/performance-analyzer.git"
runGauntletTests = "true" == System.getProperty("run.gauntlet.tests", "false")
}
Expand Down Expand Up @@ -186,15 +186,15 @@ jacocoTestCoverageVerification {
}
}
}
}
}
else {
violationRules {
rule {
limit {
minimum = 0.6
}
}
}
}
}
}

Expand Down Expand Up @@ -471,7 +471,7 @@ task copyReaderMetricsFiles(type: Copy) {
task buildDocker(type: Exec) {
dependsOn(copyAllArtifacts)
workingDir(dockerArtifactsDir)
commandLine 'docker', 'build', '-t', 'opensearch/pa-rca:2.9', '.', '--build-arg', "JDK_VER=${buildDockerJdkVersion}"
commandLine 'docker', 'build', '-t', 'opensearch/pa-rca:2.10', '.', '--build-arg', "JDK_VER=${buildDockerJdkVersion}"
}

task runDocker(type: Exec) {
Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ version: '2.1'
services:
opensearch1:
container_name: opensearch1
image: opensearch/pa-rca:2.9
image: opensearch/pa-rca:2.10
mem_limit: 4g
networks:
opensearchnet:
Expand All @@ -34,7 +34,7 @@ services:
container_name: opensearch2
environment:
- node.cluster_manager=false
image: opensearch/pa-rca:2.9
image: opensearch/pa-rca:2.10
mem_limit: 4g
networks:
- opensearchnet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@ public final class Version {
* transferred packets should be dropped. Every increment here should be accompanied with a line
* describing the version bump.
*
* Note: The RCA version is agnostic of OpenSearch version.
* <p>Note: The RCA version is agnostic of OpenSearch version.
*/
static final class Major {
// Bumping this post the Commons Lib(https://github.com/opensearch-project/performance-analyzer-commons/issues/2)
// and Service Metrics(https://github.com/opensearch-project/performance-analyzer-commons/issues/8) change
// Bumping this post the Commons
// Lib(https://github.com/opensearch-project/performance-analyzer-commons/issues/2)
// and Service
// Metrics(https://github.com/opensearch-project/performance-analyzer-commons/issues/8)
// change
static final int RCA_MAJ_VERSION = 1;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ public void construct() {
// Use EVALUATION_INTERVAL_SECONDS instead of RCA_PERIOD which resolved to 12 seconds.
// This is resulting in this RCA not getting executed in every 5 seconds.
Rca<ResourceFlowUnit<HotNodeSummary>> threadMetricsRca =
new ThreadMetricsRca(threadBlockedTime, threadWaitedTime, EVALUATION_INTERVAL_SECONDS);
new ThreadMetricsRca(
threadBlockedTime, threadWaitedTime, EVALUATION_INTERVAL_SECONDS);
threadMetricsRca.addTag(
RcaConsts.RcaTagConstants.TAG_LOCUS,
RcaConsts.RcaTagConstants.LOCUS_DATA_CLUSTER_MANAGER_NODE);
Expand Down
Loading