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

Publish internal code #36

Merged
merged 34 commits into from
Dec 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5194ff8
Publish hdfs modifications
zzuljin Dec 2, 2024
07b486d
Merge branch 'main' of https://github.com/mishmash-io/for-apache into…
arusevm Dec 2, 2024
a8dcdde
Configure hdfs tests
zzuljin Dec 4, 2024
31916b5
Merge branch 'publish-internal-code' of https://github.com/mishmash-i…
zzuljin Dec 4, 2024
883b5fb
Reconfigure hadoop resources
zzuljin Dec 6, 2024
29cf028
add KMS resources
zzuljin Dec 9, 2024
80bd2cf
Merge branch 'main' of https://github.com/mishmash-io/for-apache into…
zzuljin Dec 9, 2024
4f80c1c
Upgrade build/jaxb
zzuljin Dec 11, 2024
75ca636
Merge branch 'main' of https://github.com/mishmash-io/for-apache into…
zzuljin Dec 12, 2024
4972f83
Fix async log files dir
zzuljin Dec 12, 2024
afe3401
First test separation
zzuljin Dec 19, 2024
ba1c351
Update build workflow
arusevm Dec 19, 2024
d6ba9c0
Merge branch 'main' of https://github.com/mishmash-io/for-apache into…
arusevm Dec 19, 2024
7757181
Fixing build
arusevm Dec 19, 2024
aca3136
Rename workflow variable
zzuljin Dec 20, 2024
c853641
Refactor workflow
zzuljin Dec 20, 2024
838c4d1
Refactor workflow
zzuljin Dec 20, 2024
685863c
Refactor workflow
zzuljin Dec 20, 2024
db2e477
Refactor workflow
zzuljin Dec 20, 2024
71975c1
Refactor workflow
zzuljin Dec 20, 2024
4423dd3
Refactor workflow
zzuljin Dec 20, 2024
14f6caa
Refactor workflow
zzuljin Dec 20, 2024
0505837
Refactor workflow
zzuljin Dec 20, 2024
aa8839b
Refactor workflow
zzuljin Dec 20, 2024
ddeb5af
Refactor workflow
zzuljin Dec 20, 2024
8ec18a1
Refactor workflow
zzuljin Dec 20, 2024
3b6af7a
Refactor workflow
zzuljin Dec 20, 2024
c79ba60
Fix build
zzuljin Dec 20, 2024
aae321a
Upgrade logback
zzuljin Dec 20, 2024
70c3c87
Fix workflow caching
zzuljin Dec 20, 2024
56e62ad
Allow workflow jobs to run independently
zzuljin Dec 20, 2024
3a91c5d
Update zk tests
zzuljin Dec 21, 2024
28598f6
Update workflow run caches
zzuljin Dec 21, 2024
a7517de
Add more test jobs
zzuljin Dec 21, 2024
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
128 changes: 108 additions & 20 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,66 +15,154 @@ on:
branches: [ "main" ]

jobs:
build:

compile:
name: Compile everything
runs-on: ubuntu-latest

timeout-minutes: 520

# allow 'Update dependency graph' step below to submit the generated graph
permissions:
contents: write
pull-requests: write

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'
- name: Build with Maven
run: mvn -DskipTests install --file pom.xml
- name: Cache build artifacts
uses: actions/cache/save@v4
id: buildcache
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ github.run_id }}-${{ github.run_attempt }}
- name: Update dependency graph
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
continue-on-error: true

test:
needs: compile
runs-on: ubuntu-latest
strategy:
fail-fast: false
max-parallel: 3
matrix:
testset:
- 'coordination/base'
- 'storage/block/base'
- 'storage/block/balancer'
- 'storage/block/blockmanagement'
- 'storage/block/datanode'
- 'storage/block/dfs-base'
- 'storage/block/fs-base'
- 'storage/block/misc'
include:
- telemetryport: 4317
testset: 'coordination/base'
- telemetryport: 4319
testset: 'storage/block/base'
- telemetryport: 4321
testset: 'storage/block/balancer'
- telemetryport: 4323
testset: 'storage/block/blockmanagement'
- telemetryport: 4325
testset: 'storage/block/datanode'
- telemetryport: 4327
testset: 'storage/block/dfs-base'
- telemetryport: 4329
testset: 'storage/block/fs-base'
- telemetryport: 4331
testset: 'storage/block/misc'
- telemetryoutput: 'coordination-base'
testset: 'coordination/base'
- telemetryoutput: 'storage-block-base'
testset: 'storage/block/base'
- telemetryoutput: 'storage-block-balancer'
testset: 'storage/block/balancer'
- telemetryoutput: 'storage-block-blockmanagement'
testset: 'storage/block/blockmanagement'
- telemetryoutput: 'storage-block-datanode'
testset: 'storage/block/datanode'
- telemetryoutput: 'storage-block-dfs-base'
testset: 'storage/block/dfs-base'
- telemetryoutput: 'storage-block-fs-base'
testset: 'storage/block/fs-base'
- telemetryoutput: 'storage-block-misc'
testset: 'storage/block/misc'
- testname: 'Base distributed coordination tests'
testset: 'coordination/base'
- testname: 'Base distributed block storage tests'
testset: 'storage/block/base'
- testname: 'Distributed block storage balancer tests'
testset: 'storage/block/balancer'
- testname: 'Distributed block storage management tests'
testset: 'storage/block/blockmanagement'
- testname: 'Distributed block storage datanode tests'
testset: 'storage/block/datanode'
- testname: 'Base distributed block dfs storage tests'
testset: 'storage/block/dfs-base'
- testname: 'Base distributed block fs storage tests'
testset: 'storage/block/fs-base'
- testname: 'Misc distributed block storage tests'
testset: 'storage/block/misc'
name: Testing, ${{ join(matrix.*, ' - ') }}

services:
otel-to-parquet:
image: mishmashio/opentelemetry-parquet-server
ports:
- 4317:4317
- 4318:4318
- ${{ matrix.telemetryport }}:4317
volumes:
- /tmp/tests-parquet:/parquet
- /tmp/tests-parquet/${{ matrix.telemetryoutput }}:/parquet

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Download latest OpenTelemetry java agent
run: curl -L -o /tmp/opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
- name: Build with Maven
- name: Restore cached build artifacts
uses: actions/cache/restore@v4
id: buildcache
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ github.run_id }}-${{ github.run_attempt }}
fail-on-cache-miss: true
- name: Run test set ${{ matrix.testset }}
env:
OTEL_SERVICE_NAME: maven-test-service
OTEL_EXPORTER_OTLP_PROTOCOL: grpc
OTEL_EXPORTER_OTLP_ENDPOINT: http://localhost:4317
run: mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar --fail-at-end -B package --file pom.xml
OTEL_EXPORTER_OTLP_ENDPOINT: http://localhost:${{ matrix.telemetryport }}
run: cd tests/${{ matrix.testset }} && mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar test --file pom.xml
- name: Upload telemetry logs
uses: actions/upload-artifact@v4
if: always()
continue-on-error: true
with:
name: build-telemetry-logs
path: /tmp/tests-parquet/logs-*.parquet
name: build-telemetry-logs-${{ matrix.telemetryoutput }}
path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/logs-*.parquet
- name: Upload telemetry metrics
uses: actions/upload-artifact@v4
if: always()
continue-on-error: true
with:
name: build-telemetry-metrics
path: /tmp/tests-parquet/metrics-*.parquet
name: build-telemetry-metrics-${{ matrix.telemetryoutput }}
path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/metrics-*.parquet
- name: Upload telemetry traces
uses: actions/upload-artifact@v4
if: always()
continue-on-error: true
with:
name: build-telemetry-traces
path: /tmp/tests-parquet/traces-*.parquet
name: build-telemetry-traces-${{ matrix.telemetryoutput }}
path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/traces-*.parquet
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
- name: Update dependency graph
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
continue-on-error: true

# - name: Publish Test Report
# if: success() || failure()
Expand Down
18 changes: 6 additions & 12 deletions hadoop/stable-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -217,18 +217,7 @@
</extension>
</extensions>

<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>

<plugins>
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down Expand Up @@ -367,7 +356,12 @@
**/hadoop/util/hash/*.java,
</includes>
<excludes>

**/hadoop/fs/CacheFlag.java,
**/hadoop/fs/Hdfs.java,
**/hadoop/fs/HdfsBlockLocation.java,
**/hadoop/fs/SWebHdfs.java,
**/hadoop/fs/WebHdfs.java,
**/hadoop/fs/package.html
</excludes>
</artifactItem>
</artifactItems>
Expand Down
Loading
Loading