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

kafka minor fix: parsing AdvertisedListeners #1791

Merged
merged 2 commits into from
Apr 16, 2024
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
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
outputs:
ghc: ${{ steps.parser.outputs.ghc }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: "recursive"

Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: "recursive"

Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
echo "After..."
df -h

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: "recursive"

Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:

docker save -o ~/data/new_hstream_image.tar $NEW_HSTREAM_IMAGE

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: image-testing-${{ matrix.ghc }}
path: ~/data/new_hstream_image.tar
Expand All @@ -209,7 +209,7 @@ jobs:
-name "hstream-server" \) \
-exec tar -rvf ~/data/hstream_tests.tar {} \;

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: hstream-tests-${{ matrix.ghc }}
path: ~/data/hstream_tests.tar
Expand All @@ -225,7 +225,7 @@ jobs:
ghc: ${{ fromJson(needs.pre-build.outputs.ghc) }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: "recursive"

Expand All @@ -239,7 +239,7 @@ jobs:
echo "TEST_CONTAINER_NAME=test-hstream-server" >> $GITHUB_ENV

- name: retrieve saved tests
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: hstream-tests-${{ matrix.ghc }}
path: ~/data
Expand Down Expand Up @@ -271,7 +271,7 @@ jobs:
docker logs $TEST_CONTAINER_NAME &> hserver.log

- name: upload hserver logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ success() }} || ${{ failure() }}
with:
name: hserver-logs-${{ matrix.ghc }}
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
df -h

- name: retrieve saved docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: image-testing-${{ matrix.ghc }}
path: ~/data
Expand Down Expand Up @@ -396,7 +396,7 @@ jobs:
df -h

- name: retrieve saved docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: image-testing-${{ matrix.ghc }}
path: ~/data
Expand Down Expand Up @@ -474,7 +474,7 @@ jobs:
df -h

- name: retrieve saved docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: image-testing-${{ matrix.ghc }}
path: ~/data
Expand All @@ -485,7 +485,7 @@ jobs:
docker run -t --rm $NEW_HSTREAM_IMAGE /usr/local/bin/hstream-server +RTS --info

- name: fetch tests source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ matrix.repo }}
submodules: "recursive"
Expand Down Expand Up @@ -513,7 +513,7 @@ jobs:
mv integration-tests/app/build/reports ci_artifact/reports

- name: upload tests-reports
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ success() }} || ${{ failure() }}
with:
name: reports-${{ matrix.test }}-${{ matrix.ghc }}
Expand All @@ -531,7 +531,7 @@ jobs:

# steps:
# - name: retrieve saved docker image
# uses: actions/download-artifact@v3
# uses: actions/download-artifact@v4
# with:
# name: image-testing-${{ matrix.ghc }}
# path: ~/data
Expand All @@ -542,7 +542,7 @@ jobs:
# docker run -t --rm $NEW_HSTREAM_IMAGE /usr/local/bin/hstream-server +RTS --info

# - name: fetch hstream io tests source code
# uses: actions/checkout@v3
# uses: actions/checkout@v4
# with:
# repository: "hstreamdb/hstream-connectors"
# submodules: "recursive"
Expand Down Expand Up @@ -580,7 +580,7 @@ jobs:
# mv /tmp/io/tasks ci_artifact/tasks

# - name: upload tests-reports
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# if: ${{ success() }} || ${{ failure() }}
# with:
# name: hstream-io-logs-${{ matrix.ghc }}
Expand All @@ -606,7 +606,7 @@ jobs:
run: kubectl get pods -A

- name: retrieve saved docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: image-testing-${{ matrix.ghc }}
path: ~/data
Expand All @@ -620,7 +620,7 @@ jobs:
echo -n "verifying images:"
docker images

- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Deploy to minikube by helm
run: |
cd deploy/chart/hstream
Expand Down Expand Up @@ -657,7 +657,7 @@ jobs:
kubectl exec -it my-hstream-0 -- hadmin server status

- name: Fetch bench source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: "hstreamdb/bench"
submodules: "recursive"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- run: |
echo "${{ matrix.tag }}"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: "recursive"
# We need tags. Also see: https://github.com/actions/checkout/issues/701
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
echo "After..."
df -h

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: "recursive"
# We need tags. Also see: https://github.com/actions/checkout/issues/701
Expand Down
1 change: 0 additions & 1 deletion hstream-kafka/HStream/Kafka/Server/Config/FromCli.hs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ parseAdvertisedListeners =
address <- AP.takeTill (== ':')
AP.char ':'
port <- AP.decimal
AP.endOfInput
return (key, Set.singleton Listener{ listenerAddress = address, listenerPort = port})
in (Map.fromListWith Set.union <$>) . AP.parseOnly (parser `AP.sepBy` AP.char ',')

Expand Down
Loading