Merge branch 'main' into allow_old_authn

Author: mohitkhullar

.github/workflows/build.yml

@@ -17,7 +17,7 @@ on:
 # is built to avoid wasting runner minutes. Treat "main" as an exception,
 # probably best to test all commits to it.
 concurrency:
-  group: ${{ github.ref }}
+  group: ${{ github.workflow }}-pr-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 # We can have multiple jobs. Jobs run in parallel unless they explicitly declare

.github/workflows/clang-format.yml

@@ -0,0 +1,47 @@
+name: clang-format
+
+on:
+  pull_request: { branches: ["main"] }
+
+# If someone pushes a new commit to a branch, ensure that only the latest commit
+# is built to avoid wasting runner minutes.
+concurrency:
+  group: ${{ github.workflow }}-pr-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: true
+
+
+jobs:
+  clang-format:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    env:
+      CLANG_FORMAT: "clang-format"
+    defaults:
+      run:
+        # Make sure to fail any "run" step early on so that steps don't silently
+        # pass even when errors may have occurred.
+        shell: bash -o errexit -o nounset -o pipefail {0}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with: { fetch-depth: 0 }
+
+      - name: Install clang-format
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang-format
+          $CLANG_FORMAT --version
+
+      - name: Run format check
+        run: |
+          base_repo="${{ github.event.pull_request.base.repo.full_name || github.repository }}"
+          base_url="https://github.com/${base_repo}.git"
+
+          # Fetch the base branch into a unique namespace
+          git fetch --no-tags --prune --depth=1 "${base_url}" \
+            "refs/heads/${GITHUB_BASE_REF}:refs/remotes/__base__/${GITHUB_BASE_REF}"
+
+          # Compute merge-base vs the fetched ref
+          base_commit="$(git merge-base HEAD "refs/remotes/__base__/${GITHUB_BASE_REF}")"
+
+          ./ci/scripts/format --verbose --dry-run --compare-base "${base_commit}"

bbinc/hostname_support.h

@@ -19,6 +19,7 @@
 
 char *get_hostname_by_fileno(int);
 int get_hostname_by_fileno_v2(int, char *, size_t);
+char *get_cached_hostname_by_addr(struct sockaddr_in *saddr);
 
 #ifndef DISABLE_HOSTADDR_CACHE
 void init_peer_hash(void);

bbinc/sbuf2.h

@@ -59,6 +59,8 @@ enum SBUF2_FLAGS {
     SBUF2_NO_BLOCK = 16,
     /* the underlying connection has been marked 'READONLY' */
     SBUF2_IS_READONLY = 32,
+    /* do not close ssl */
+    SBUF2_NO_SSL_CLOSE = 64,
 };
 
 typedef int (*sbuf2readfn)(SBUF2 *sb, char *buf, int nbytes);

bdb/bdb_api.h

@@ -1995,6 +1995,7 @@ int bdb_flush_up_to_lsn(bdb_state_type *bdb_state, unsigned file,
 int bdb_set_parallel_recovery_threads(bdb_state_type *bdb_state, int nthreads);
 unsigned long long bdb_get_commit_genid(bdb_state_type *bdb_state, void *plsn);
 void bdb_set_commit_lsn_gen(bdb_state_type *bdb_state, const void *lsn, uint32_t gen);
+unsigned long long prev_genid(bdb_state_type *bdb_state, unsigned long long genid);
 unsigned long long bdb_get_commit_genid_generation(bdb_state_type *bdb_state,
                                                    void *plsn,
                                                    uint32_t *generation);

bdb/bdb_int.h

@@ -1617,6 +1617,8 @@ int bdb_get_active_logical_transaction_lsns(bdb_state_type *bdb_state,
 
 unsigned long long get_lowest_genid_for_datafile(int file);
 
+unsigned long long format_genid_for_stripe(unsigned long long genid, int stripe);
+
 uint32_t bdb_get_lid_from_cursortran(cursor_tran_t *curtran);
 
 DBC *get_cursor_for_cursortran_flags(cursor_tran_t *curtran, DB *db,

bdb/genid.c

@@ -73,6 +73,44 @@ static unsigned long long commit_genid;
 static DB_LSN commit_lsn;
 static uint32_t commit_generation;
 
+static inline unsigned long long prev_genid_timebased(unsigned long long genid)
+{
+    unsigned int *iptr = (unsigned int *)&genid;
+    unsigned int epoch = ntohl(iptr[0]);
+    unsigned short *sptr = (unsigned short *)&genid;
+    unsigned int dupecount = ntohs(sptr[2]);
+
+    if (dupecount > 1) {
+        dupecount--;
+    } else {
+        epoch--;
+        dupecount = 0xffff;
+    }
+
+    iptr[0] = htonl(epoch);
+    iptr[1] = htonl(dupecount << 16);
+    return genid;
+}
+
+static inline unsigned long long prev_genid48(unsigned long long genid)
+{
+    unsigned long long seed = (flibc_ntohll(genid >> 16) - 1);
+    return flibc_htonll((seed << 16));
+}
+
+unsigned long long prev_genid(bdb_state_type *bdb_state, unsigned long long genid)
+{
+    return (bdb_state->genid_format == LLMETA_GENID_48BIT) ? prev_genid48(genid) : prev_genid_timebased(genid);
+}
+
+unsigned long long format_genid_for_stripe(unsigned long long genid, int stripe)
+{
+    unsigned long long s = stripe;
+    genid &= ~(GENID_STRIPE_MASK);
+    genid |= ((s << GENID_STRIPE_SHIFT) & GENID_STRIPE_MASK);
+    return genid;
+}
+
 unsigned long long get_lowest_genid_for_datafile(int stripe)
 {
     unsigned long long g = stripe;

bdb/rep.c

@@ -5564,8 +5564,9 @@ void *watcher_thread(void *arg)
             int nrecs;
             // if we're not seeing records or seeing only very old records, poke replication
             // to request records in the range we expect
-            if (gbl_nudge_replication_when_idle && bdb_state->dbenv->get_rep_lsns(bdb_state->dbenv, &next_lsn, &gap_lsn, &nrecs) == 0) {
-                if (nrecs == 0 && !IS_ZERO_LSN(gap_lsn)) {
+            if (gbl_nudge_replication_when_idle > 0 &&
+                bdb_state->dbenv->get_rep_lsns(bdb_state->dbenv, &next_lsn, &gap_lsn, &nrecs) == 0) {
+                if (nrecs < gbl_nudge_replication_when_idle && !IS_ZERO_LSN(gap_lsn)) {
                     DB_LSN tmp_lsn = {0};
                     DBT max_lsn_dbt = {0};
                     LOGCOPY_TOLSN(&tmp_lsn, &gap_lsn);