From 447a174065b1dc3a31b8792e9021c816ac19866f Mon Sep 17 00:00:00 2001
From: "R.I.Pienaar" <rip@devco.net>
Date: Thu, 16 Mar 2023 11:23:24 +0100
Subject: [PATCH 1/2] move dev nightly to same shared action

Signed-off-by: R.I.Pienaar <rip@devco.net>
---
 .github/workflows/nightly.yaml    | 38 +++++++------------------------
 .github/workflows/rc_nightly.yaml |  2 +-
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 8944880c..19dbd475 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -1,4 +1,4 @@
-name: NATS Server Nightly
+name: "NATS Server Nightly: DEV"
 on:
   workflow_dispatch: {}
 
@@ -9,39 +9,17 @@ on:
 jobs:
   nightly_release:
     runs-on: ubuntu-latest
-
-    env:
-      GOPATH: /home/runner/work/nats-server
-      GO111MODULE: "on"
-
     steps:
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
         with:
           path: src/github.com/nats-io/nats-server
           ref: dev
 
-      - name: Set up Go
-        uses: actions/setup-go@v3
+      - uses: ./src/github.com/nats-io/nats-server/.github/actions/nightly-release
         with:
-          go-version: 1.19
-
-      - name: goreleaser
-        uses: goreleaser/goreleaser-action@v3
-        with:
-          version: latest
-          args: release --snapshot --config .goreleaser-nightly.yml
-
-      - name: images
-        run: |
-          docker images
-
-      - name: docker_login
-        run: |
-          docker login -u "${{ secrets.DOCKER_USERNAME }}" -p "${{ secrets.DOCKER_PASSWORD }}"
-
-      - name: docker_push
-        run: |
-          NDATE=$(date +%Y%m%d)
-          docker push synadia/nats-server:nightly-${NDATE}
-          docker push synadia/nats-server:nightly
+          go: "1.19"
+          workdir: src/github.com/nats-io/nats-server
+          label: nightly
+          hub_username: "${{ secrets.DOCKER_USERNAME }}"
+          hub_password: "${{ secrets.DOCKER_PASSWORD }}"
\ No newline at end of file
diff --git a/.github/workflows/rc_nightly.yaml b/.github/workflows/rc_nightly.yaml
index 29e16bd8..9dc68f7d 100644
--- a/.github/workflows/rc_nightly.yaml
+++ b/.github/workflows/rc_nightly.yaml
@@ -1,4 +1,4 @@
-name: NATS Server Nightly MAIN
+name: "NATS Server Nightly: MAIN"
 on:
   workflow_dispatch: {}
 

From 9f99efad030bb8f145956afcc67f79992be6429c Mon Sep 17 00:00:00 2001
From: Neil Twigg <neil@nats.io>
Date: Thu, 16 Mar 2023 17:39:26 +0000
Subject: [PATCH 2/2] Use pooled buffer for flushing encrypted message blocks

---
 server/filestore.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/server/filestore.go b/server/filestore.go
index d2067141..b4f75957 100644
--- a/server/filestore.go
+++ b/server/filestore.go
@@ -3993,16 +3993,17 @@ func (mb *msgBlock) flushPendingMsgsLocked() (*LostStreamData, error) {
 
 	// Check if we need to encrypt.
 	if mb.bek != nil && lob > 0 {
-		const rsz = 32 * 1024 // 32k
-		var rdst [rsz]byte
-		var dst []byte
-		if lob > rsz {
-			dst = make([]byte, lob)
-		} else {
-			dst = rdst[:lob]
-		}
 		// Need to leave original alone.
+		var dst []byte
+		if lob <= defaultLargeBlockSize {
+			dst = getMsgBlockBuf(lob)[:lob]
+		} else {
+			dst = make([]byte, lob)
+		}
 		mb.bek.XORKeyStream(dst, buf)
+		if cap(buf) <= defaultLargeBlockSize {
+			recycleMsgBlockBuf(buf)
+		}
 		buf = dst
 	}