You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2026/04/15 16:54:07 UTC
(pulsar) branch branch-4.1 updated (a9d866c7daf -> 990ac69414e)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from a9d866c7daf [cleanup][build] Bumped version to 4.1.4-SNAPSHOT
new 89223cecb4f [fix][ci] Fix .github/actions/ssh-access which is used for debugging Pulsar CI in forks (#25075)
new aa4d02b78e2 [improve][ci] Backport fix for ssh-access action
new 4fb74149010 [fix][ci] Disable trivy-action (#25373)
new 990ac69414e [fix][ci] Ensure discard_max_bytes is set to 0 only for existing block devices (#25510)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/actions/ssh-access/action.yml | 41 ++++++++++++++-----------------
.github/actions/tune-runner-vm/action.yml | 6 +++--
.github/workflows/pulsar-ci.yaml | 40 +++++++++++++++---------------
3 files changed, 43 insertions(+), 44 deletions(-)
(pulsar) 03/04: [fix][ci] Disable trivy-action (#25373)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4fb74149010c87f83e3387be832ec5e08f3b5beb
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri Mar 20 21:24:08 2026 +0200
[fix][ci] Disable trivy-action (#25373)
(cherry picked from commit 6e577f0bc5a7c3184fdb75d6afdd54a56578aa26)
---
.github/workflows/pulsar-ci.yaml | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/pulsar-ci.yaml b/.github/workflows/pulsar-ci.yaml
index 9acb6d6134a..a3f1829831d 100644
--- a/.github/workflows/pulsar-ci.yaml
+++ b/.github/workflows/pulsar-ci.yaml
@@ -545,7 +545,7 @@ jobs:
$GITHUB_WORKSPACE/build/pulsar_ci_tool.sh restore_tar_from_github_actions_artifacts pulsar-maven-repository-binaries
- name: Set up QEMU
- uses: docker/setup-qemu-action@v3
+ uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392
with:
platforms: arm64
@@ -938,25 +938,25 @@ jobs:
- name: Check binary licenses
run: src/check-binary-license.sh ./distribution/server/target/apache-pulsar-*-bin.tar.gz && src/check-binary-license.sh ./distribution/shell/target/apache-pulsar-shell-*-bin.tar.gz
- - name: Run Trivy container scan
- id: trivy_scan
- uses: aquasecurity/trivy-action@0.26.0
- if: ${{ github.repository == 'apache/pulsar' && github.event_name != 'pull_request' }}
- continue-on-error: true
- with:
- image-ref: "apachepulsar/pulsar:latest"
- scanners: vuln
- severity: CRITICAL,HIGH,MEDIUM,LOW
- limit-severities-for-sarif: true
- format: 'sarif'
- output: 'trivy-results.sarif'
-
- - name: Upload Trivy scan results to GitHub Security tab
- uses: github/codeql-action/upload-sarif@v3
- if: ${{ steps.trivy_scan.outcome == 'success' && github.repository == 'apache/pulsar' && github.event_name != 'pull_request' }}
- continue-on-error: true
- with:
- sarif_file: 'trivy-results.sarif'
+# - name: Run Trivy container scan
+# id: trivy_scan
+# uses: aquasecurity/trivy-action@v0.35.0
+# if: ${{ github.repository == 'apache/pulsar' && github.event_name != 'pull_request' }}
+# continue-on-error: true
+# with:
+# image-ref: "apachepulsar/pulsar:latest"
+# scanners: vuln
+# severity: CRITICAL,HIGH,MEDIUM,LOW
+# limit-severities-for-sarif: true
+# format: 'sarif'
+# output: 'trivy-results.sarif'
+#
+# - name: Upload Trivy scan results to GitHub Security tab
+# uses: github/codeql-action/upload-sarif@v3
+# if: ${{ steps.trivy_scan.outcome == 'success' && github.repository == 'apache/pulsar' && github.event_name != 'pull_request' }}
+# continue-on-error: true
+# with:
+# sarif_file: 'trivy-results.sarif'
- name: Clean up disk space
run: |
(pulsar) 02/04: [improve][ci] Backport fix for ssh-access action
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit aa4d02b78e2cb4f89dedd90df4d80850c974736a
Author: Lari Hotari <lh...@apache.org>
AuthorDate: Wed Apr 15 19:00:08 2026 +0300
[improve][ci] Backport fix for ssh-access action
(cherry picked from commit 307717f36bace3c0f189086fb373697935f7444e)
---
.github/actions/ssh-access/action.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.github/actions/ssh-access/action.yml b/.github/actions/ssh-access/action.yml
index 2c8f0a01648..89f9b74e604 100644
--- a/.github/actions/ssh-access/action.yml
+++ b/.github/actions/ssh-access/action.yml
@@ -138,7 +138,8 @@ runs:
if command -v upterm &>/dev/null; then
shopt -s nullglob
echo "SSH connection information"
- upterm session current --admin-socket ~/.upterm/*.sock || {
+ export UPTERM_ADMIN_SOCKET=$(find $HOME/.upterm $XDG_RUNTIME_DIR/upterm /run/user/$(id -u)/upterm -name "*.sock" | head -n 1)
+ upterm session current || {
echo "upterm isn't running. Not waiting any longer."
exit 0
}
@@ -146,7 +147,7 @@ runs:
echo "Waiting $timeout seconds..."
sleep $timeout
echo "Keep waiting as long as there's a connected session"
- while upterm session current --admin-socket ~/.upterm/*.sock|grep Connected &>/dev/null; do
+ while upterm session current|grep Connected &>/dev/null; do
sleep 30
done
echo "No session is connected. Not waiting any longer."
(pulsar) 01/04: [fix][ci] Fix .github/actions/ssh-access which is used for debugging Pulsar CI in forks (#25075)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 89223cecb4f971cce8482171e709d660a9bde8ba
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Tue Dec 16 08:49:29 2025 +0200
[fix][ci] Fix .github/actions/ssh-access which is used for debugging Pulsar CI in forks (#25075)
(cherry picked from commit b94a4bb78841e14a9e067b3a1d88a88f0d0d9dd4)
---
.github/actions/ssh-access/action.yml | 36 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/.github/actions/ssh-access/action.yml b/.github/actions/ssh-access/action.yml
index b4ad4a8555e..2c8f0a01648 100644
--- a/.github/actions/ssh-access/action.yml
+++ b/.github/actions/ssh-access/action.yml
@@ -52,14 +52,14 @@ runs:
echo "::group::Installing upterm & tmux"
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
# install upterm
- curl -sL https://github.com/owenthereal/upterm/releases/download/v0.7.6/upterm_linux_amd64.tar.gz | tar zxvf - -C /tmp upterm && sudo install /tmp/upterm /usr/local/bin/ && rm -rf /tmp/upterm
-
+ curl -sL https://github.com/owenthereal/upterm/releases/download/v0.20.0/upterm_linux_amd64.tar.gz | tar zxvf - -C /tmp upterm && sudo install /tmp/upterm /usr/local/bin/ && rm -rf /tmp/upterm
+
# install tmux if it's not present
if ! command -v tmux &>/dev/null; then
sudo apt-get -y install tmux
fi
elif [[ "$OSTYPE" == "darwin"* ]]; then
- brew install owenthereal/upterm/upterm
+ brew install --cask owenthereal/upterm/upterm
# install tmux if it's not present
if ! command -v tmux &>/dev/null; then
brew install tmux
@@ -68,7 +68,7 @@ runs:
echo "Unsupported $OSTYPE"
exit 0
fi
- echo '::endgroup::'
+ echo '::endgroup::'
echo "::group::Configuring ssh and ssh keys"
# generate ssh key
mkdir -p ~/.ssh
@@ -80,11 +80,7 @@ runs:
ssh-keygen -q -t ed25519 -N "" -f ~/.ssh/id_ed25519
fi
# configure ssh
- echo -e "Host *\nStrictHostKeyChecking no\nCheckHostIP no\nTCPKeepAlive yes\nServerAliveInterval 30\nServerAliveCountMax 180\nVerifyHostKeyDNS yes\nUpdateHostKeys yes\n" > ~/.ssh/config
- # Auto-generate ~/.ssh/known_hosts by attempting connection to uptermd.upterm.dev
- ssh -i ~/.ssh/id_ed25519 uptermd.upterm.dev || true
- # @cert-authority entry is a mandatory entry when connecting to upterm. generate the entry based on the known_hosts entry key
- cat <(cat ~/.ssh/known_hosts | awk '{ print "@cert-authority * " $2 " " $3 }') >> ~/.ssh/known_hosts
+ echo -e "Host *\nStrictHostKeyChecking no\nCheckHostIP no\nTCPKeepAlive yes\nServerAliveInterval 30\nServerAliveCountMax 180\nVerifyHostKeyDNS yes\nUpdateHostKeys yes\nAddressFamily inet\n" > ~/.ssh/config
authorizedKeysParameter=""
authorizedKeysFile=${HOME}/.ssh/authorized_keys
if [[ "${{ inputs.secure-access }}" != "false" ]]; then
@@ -106,35 +102,35 @@ runs:
done
if [ -f $authorizedKeysFile ]; then
chmod 0600 $authorizedKeysFile
- authorizedKeysParameter="-a $authorizedKeysFile"
+ authorizedKeysParameter="--authorized-keys $authorizedKeysFile"
echo -e "Using $authorizedKeysFile\nContent:\n---------------------------"
cat $authorizedKeysFile
echo "---------------------------"
fi
- echo '::endgroup::'
+ echo '::endgroup::'
echo "::group::Starting terminal session and connecting to server"
- tmux new -d -s upterm-wrapper -x 132 -y 43 "upterm host ${authorizedKeysParameter} --force-command 'tmux attach -t upterm' -- tmux new -s upterm -x 132 -y 43"
- sleep 2
- tmux send-keys -t upterm-wrapper q C-m
+ echo 'set-option -ga update-environment " UPTERM_ADMIN_SOCKET"' >> ~/.tmux.conf
+ tmux new -d -s upterm-wrapper -x 132 -y 43 "upterm host --skip-host-key-check --accept ${authorizedKeysParameter} --force-command 'tmux attach -t upterm' -- tmux new -s upterm -x 132 -y 43"
sleep 1
tmux set -t upterm-wrapper window-size largest
tmux set -t upterm window-size largest
- echo '::endgroup::'
+ echo '::endgroup::'
echo -e "\nSSH connection information"
# wait up to 10 seconds for upterm admin socket to appear
for i in {1..10}; do
- ADMIN_SOCKET=$(find $HOME/.upterm -name "*.sock")
- if [ ! -S "$ADMIN_SOCKET" ]; then
- echo "Waiting for upterm admin socket to appear in ~/.upterm/*.sock ..."
+ export UPTERM_ADMIN_SOCKET=$(find $HOME/.upterm $XDG_RUNTIME_DIR/upterm /run/user/$(id -u)/upterm -name "*.sock" | head -n 1)
+ if [ ! -S "$UPTERM_ADMIN_SOCKET" ]; then
+ echo "Waiting for upterm admin socket ..."
sleep 1
else
- echo "upterm admin socket available in $ADMIN_SOCKET"
+ echo "upterm admin socket available in $UPTERM_ADMIN_SOCKET"
break
fi
done
shopt -s nullglob
- upterm session current --admin-socket ~/.upterm/*.sock || {
+ upterm session current || {
echo "Starting upterm failed."
+ cat $HOME/.upterm/upterm.log
exit 0
}
elif [[ "${{ inputs.action }}" == "wait" ]]; then
(pulsar) 04/04: [fix][ci] Ensure discard_max_bytes is set to 0 only for existing block devices (#25510)
Posted by lh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 990ac69414e8f7ec44c281be568dac84ead00048
Author: Zixuan Liu <no...@gmail.com>
AuthorDate: Mon Apr 13 13:05:23 2026 +0800
[fix][ci] Ensure discard_max_bytes is set to 0 only for existing block devices (#25510)
(cherry picked from commit 089f87f329bb5c576c4a731d95bd8564ca8a66b6)
---
.github/actions/tune-runner-vm/action.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/actions/tune-runner-vm/action.yml b/.github/actions/tune-runner-vm/action.yml
index d071f534dbb..da9c7f06839 100644
--- a/.github/actions/tune-runner-vm/action.yml
+++ b/.github/actions/tune-runner-vm/action.yml
@@ -53,8 +53,10 @@ runs:
fi
# disable discard/trim at device level since remount with nodiscard doesn't seem to be effective
# https://www.spinics.net/lists/linux-ide/msg52562.html
- for i in /sys/block/sd*/queue/discard_max_bytes; do
- echo 0 | sudo tee $i
+ for i in /sys/block/*/queue/discard_max_bytes; do
+ if [ -f "$i" ]; then
+ echo 0 | sudo tee "$i"
+ fi
done
# disable unnecessary timers
sudo systemctl stop fstrim.timer fstrim.service \