Galera macos

.jenkins/aws-galera-4-ee-fullbuild.groovy

@@ -0,0 +1,93 @@
+
+pipeline {
+
+  agent none
+
+  stages {
+
+    stage ('Build sourcetar') {
+      steps {
+        script {
+
+          def sourceJob = build job: 'aws-galera-4-ee-sourcetar',  wait: true,
+            parameters: [
+              string( name: 'GIT_TARGET', value: env.GIT_TARGET ),
+              booleanParam( name: 'HOTFIX_BUILD', value: env.HOTFIX_BUILD)
+              ]
+          env.SRCTAR_JOB = sourceJob.getNumber().toString()
+        }
+      }
+    }
+
+    stage ('Build binary packages') {
+
+    parallel {
+      stage ('Build bintar') {
+        steps {
+          script {
+            def bintarJob = build job: 'aws-galera-4-ee-bintar', wait: true,
+              parameters: [string(name: 'BUILD_SELECTOR', value: env.SRCTAR_JOB )]
+            env.BINTAR_JOB = bintarJob.getNumber().toString()
+            }
+          }
+        }
+      stage ('Build rpm packages') {
+        steps {
+          script {
+            def rpmJob = build job: 'aws-galera-4-ee-rpm-packages', wait: true,
+              parameters: [string(name: 'BUILD_SELECTOR', value: env.SRCTAR_JOB )]
+            env.RPM_JOB = rpmJob.getNumber().toString()
+            }
+          }
+        }
+      stage ('Build deb packages') {
+        steps {
+          script {
+            def debJob = build job: 'aws-galera-4-ee-deb-packages', wait: true,
+              parameters: [string(name: 'BUILD_SELECTOR', value: env.SRCTAR_JOB )]
+            env.DEB_JOB = debJob.getNumber().toString()
+            }
+          }
+        }
+      } // parallel
+
+    } // Build binary packages
+
+    stage ('Run tests') {
+      parallel {
+        stage('Run bintar test') {
+          steps {
+            build job: 'run-galera-4-ee-release-test', wait: true,
+              parameters: [string(name: 'BUILD_SELECTOR', value: env.BINTAR_JOB )]
+          }
+        }
+        stage ('Run RPM test') {
+          steps {
+            build job: 'run-galera-4-ee-rpm-test', wait: true,
+              parameters: [string(name: 'BUILD_SELECTOR', value: env.RPM_JOB )]
+          }
+        }
+        stage ('Run DEB test') {
+          steps {
+            build job: 'run-galera-4-ee-deb-test', wait: true,
+              parameters: [string(name: 'BUILD_SELECTOR', value: env.DEB_JOB )]
+          }
+        }
+        stage ('Run SST RPM test') {
+          steps {
+            build job: 'run-galera-4-ee-systemd-sst-rpm-test', wait: true,
+              parameters: [string(name: 'BUILD_SELECTOR', value: env.RPM_JOB )]
+          }
+        }
+        stage ('Run SST DEB test') {
+          steps {
+            build job: 'run-galera-4-ee-systemd-sst-deb-test', wait: true,
+              parameters: [string(name: 'BUILD_SELECTOR', value: env.DEB_JOB )]
+          }
+        }
+      } // parallel
+    }
+
+  } // stages
+
+}

GALERA_VERSION

@@ -1,4 +1,4 @@
 GALERA_VERSION_WSREP_API=26
 GALERA_VERSION_MAJOR=4
-GALERA_VERSION_MINOR=19
+GALERA_VERSION_MINOR=20
 GALERA_VERSION_EXTRA=

SConstruct

@@ -170,7 +170,7 @@ static_ssl = ARGUMENTS.get('static_ssl', None)
 install = ARGUMENTS.get('install', None)
 version_script = int(ARGUMENTS.get('version_script', 1))
 
-GALERA_VER = ARGUMENTS.get('version', '4.19')
+GALERA_VER = ARGUMENTS.get('version', '4.20')
 GALERA_REV = ARGUMENTS.get('revno', 'XXXX')
 
 # Attempt to read from file if not given

debian/changelog

@@ -1,5 +1,5 @@
-galera-4 (26.4.19) UNRELEASED; urgency=medium
+galera-4 (26.4.20) UNRELEASED; urgency=medium
 
   * Galera 4 release
 
- -- Codership Oy <[email protected]>  Mon, 24 Jun 2024 20:10:30 +0300
+ -- Codership Oy <[email protected]>  Tue, 30 Jul 2024 05:58:45 +0300

galera/src/galera_gcs.hpp

@@ -96,7 +96,7 @@ namespace galera
             const char* node_name     = 0,
             const char* node_incoming = 0)
             :
-            conn_(gcs_create(reinterpret_cast<gu_config_t*>(&config),
+            conn_(gcs_create(config,
                              reinterpret_cast<gcache_t*>(&cache),
                              cb,
                              node_name, node_incoming,

galera/src/ist.cpp

@@ -355,7 +355,6 @@ galera::ist::Receiver::prepare(wsrep_seqno_t const first_seqno,
     return recv_addr_;
 }
 
-
 void galera::ist::Receiver::run()
 {
     auto socket(acceptor_->accept());
@@ -365,6 +364,7 @@ void galera::ist::Receiver::run()
     gu::Progress<wsrep_seqno_t>* progress(NULL);
 
     int ec(0);
+    std::ostringstream error_os;
 
     try
     {
@@ -410,9 +410,8 @@ void galera::ist::Receiver::run()
                 assert(!progress);
                 if (act.seqno_g > first_seqno_)
                 {
-                    log_error
-                        << "IST started with wrong seqno: " << act.seqno_g
-                        << ", expected <= " << first_seqno_;
+                    error_os << "IST started with wrong seqno: " << act.seqno_g
+                             << ", expected <= " << first_seqno_;
                     ec = EINVAL;
                     goto err;
                 }
@@ -438,8 +437,8 @@ void galera::ist::Receiver::run()
 
             if (act.seqno_g != current_seqno_)
             {
-                log_error << "Unexpected action seqno: " << act.seqno_g
-                          << " expected: " << current_seqno_;
+                error_os << "Unexpected action seqno: " << act.seqno_g
+                         << " expected: " << current_seqno_;
                 ec = EINVAL;
                 goto err;
             }
@@ -508,7 +507,7 @@ void galera::ist::Receiver::run()
         ec = e.get_errno();
         if (ec != EINTR)
         {
-            log_error << "got exception while reading IST stream: " << e.what();
+            error_os << "got exception while reading IST stream: " << e.what();
         }
     }
 
@@ -518,17 +517,18 @@ void galera::ist::Receiver::run()
     socket->close();
 
     running_ = false;
-    if (last_seqno_ > 0 && ec != EINTR && current_seqno_ < last_seqno_)
+    if (last_seqno_ > 0 && ec != EINTR && current_seqno_ < last_seqno_ &&
+        error_os.tellp() == 0)
     {
-        log_error << "IST didn't contain all write sets, expected last: "
-                  << last_seqno_ << " last received: " << current_seqno_;
+        error_os << "IST didn't contain all write sets, expected last: "
+                 << last_seqno_ << " last received: " << current_seqno_;
         ec = EPROTO;
     }
     if (ec != EINTR)
     {
         error_code_ = ec;
     }
-    handler_.ist_end(ec);
+    handler_.ist_end(Result{ec, error_os.str()});
 }
 
 
@@ -803,7 +803,7 @@ void galera::ist::AsyncSenderMap::run(const gu::Config&   conf,
     if (err != 0)
     {
         delete as;
-        gu_throw_error(err) << "failed to start sender thread";
+        gu_throw_system_error(err) << "failed to start sender thread";
     }
     senders_.insert(as);
 }

galera/src/ist.hpp

@@ -29,6 +29,15 @@ namespace galera
         void register_params(gu::Config& conf);
 
 
+        struct Result
+        {
+            int error;
+            std::string error_str;
+            Result(int error_arg, const std::string& error_str_arg)
+                : error{error_arg}
+                , error_str{error_str_arg}
+            { }
+        };
         // IST event handler interface
         class EventHandler
         {
@@ -40,7 +49,7 @@ namespace galera
             virtual void ist_cc(const gcs_act_cchange&,const gcs_action&,
                                 bool must_apply, bool preload) = 0;
             // Report IST end
-            virtual void ist_end(int error) = 0;
+            virtual void ist_end(const Result&) = 0;
         protected:
             virtual ~EventHandler() {}
         };

galera/src/ist_proto.hpp

@@ -744,7 +744,8 @@ namespace galera
                         }
                         else
                         {
-                            gu_throw_error(-msg.ctrl()) <<"peer reported error";
+                            gu_throw_error(-msg.ctrl())
+                                << "peer reported error: " << -msg.ctrl();
                         }
                     }
                 default:

galera/src/mapped_buffer.cpp

@@ -85,21 +85,23 @@ void galera::MappedBuffer::reserve(size_t sz)
             fd_ = mkstemp(&file_[0]);
             if (fd_ == -1)
             {
-                gu_throw_error(errno) << "mkstemp(" << file_ << ") failed";
+                gu_throw_system_error(errno)
+                    << "mkstemp(" << file_ << ") failed";
             }
             if (ftruncate(fd_, sz) == -1)
             {
-                gu_throw_error(errno) << "ftruncate() failed";
+                gu_throw_system_error(errno) << "ftruncate() failed";
             }
             byte_t* tmp(reinterpret_cast<byte_t*>(
                             mmap(NULL, sz, PROT_READ | PROT_WRITE, MAP_PRIVATE,
                                  fd_, 0)));
             if (tmp == MAP_FAILED)
             {
+                const int error = errno;
                 free(buf_);
                 buf_ = 0;
                 clear();
-                gu_throw_error(ENOMEM) << "mmap() failed";
+                gu_throw_system_error(error) << "mmap() failed";
             }
             copy(buf_, buf_ + buf_size_, tmp);
             free(buf_);
@@ -109,19 +111,20 @@ void galera::MappedBuffer::reserve(size_t sz)
         {
             if (munmap(buf_, real_buf_size_) != 0)
             {
-                gu_throw_error(errno) << "munmap() failed";
+                gu_throw_system_error(errno) << "munmap() failed";
             }
             if (ftruncate(fd_, sz) == -1)
             {
-                gu_throw_error(errno) << "fruncate() failed";
+                gu_throw_system_error(errno) << "fruncate() failed";
             }
             byte_t* tmp(reinterpret_cast<byte_t*>(
                             mmap(NULL, sz, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd_, 0)));
             if (tmp == MAP_FAILED)
             {
+                const int error = errno;
                 buf_ = 0;
                 clear();
-                gu_throw_error(ENOMEM) << "mmap() failed";
+                gu_throw_system_error(error) << "mmap() failed";
             }
             buf_ = tmp;
         }
@@ -132,7 +135,7 @@ void galera::MappedBuffer::reserve(size_t sz)
         byte_t* tmp(reinterpret_cast<byte_t*>(realloc(buf_, sz)));
         if (tmp == 0)
         {
-            gu_throw_error(ENOMEM) << "realloc failed";
+            gu_throw_system_error(ENOMEM) << "realloc failed";
         }
         buf_ = tmp;
     }

galera/src/replicator_smm.cpp

@@ -5,6 +5,7 @@
 #include "galera_common.hpp"
 #include "replicator_smm.hpp"
 #include "gcs_action_source.hpp"
+#include "gcs_error.hpp"
 #include "galera_exception.hpp"
 
 #include "galera_info.hpp"
@@ -315,7 +316,6 @@ galera::ReplicatorSMM::~ReplicatorSMM()
     delete as_;
 }
 
-
 wsrep_status_t galera::ReplicatorSMM::connect(const std::string& cluster_name,
                                               const std::string& cluster_url,
                                               const std::string& state_donor,
@@ -348,14 +348,14 @@ wsrep_status_t galera::ReplicatorSMM::connect(const std::string& cluster_name,
 
     if (ret == WSREP_OK && (err = gcs_.set_initial_position(inpos)) != 0)
     {
-        log_error << "gcs init failed:" << strerror(-err);
+        log_error << "gcs init failed:" << gcs_error_str(-err);
         ret = WSREP_NODE_FAIL;
     }
 
     if (ret == WSREP_OK &&
         (err = gcs_.connect(cluster_name, cluster_url, bootstrap)) != 0)
     {
-        log_error << "gcs connect failed: " << strerror(-err);
+        log_error << "gcs connect failed: " << gcs_error_str(-err);
         ret = WSREP_NODE_FAIL;
     }
 
@@ -1590,8 +1590,8 @@ wsrep_status_t galera::ReplicatorSMM::sync_wait(wsrep_gtid_t* upto,
         }
         catch (gu::Exception& e)
         {
-            log_warn << "gcs_caused() returned " << -e.get_errno()
-                     << " (" << strerror(e.get_errno()) << ")";
+            log_debug << "gcs_caused() returned " << -e.get_errno()
+                      << " (" << strerror(e.get_errno()) << ")";
             return WSREP_TRX_FAIL;
         }
     }
@@ -1689,7 +1689,7 @@ wsrep_status_t galera::ReplicatorSMM::wait_nbo_end(TrxHandleMaster* trx,
     else if (err < 0)
     {
         log_error << "Failed to send NBO-end: " << err << ": "
-                  << ::strerror(-err);
+                  << gcs_error_str(-err);
         return WSREP_NODE_FAIL;
     }
 
@@ -1960,7 +1960,8 @@ galera::ReplicatorSMM::preordered_commit(wsrep_po_handle_t&         handle,
 
         if (rcode < 0)
             gu_throw_error(-rcode)
-                << "Replication of preordered writeset failed.";
+                << "Replication of preordered writeset failed: "
+                << gcs_error_str(-rcode);
     }
 
     delete ws; // cleanup regardless of commit flag
@@ -2281,7 +2282,7 @@ void galera::ReplicatorSMM::process_vote(wsrep_seqno_t const seqno_g,
         default:        /* general error */
             assert(ret < 0);
             msg << "Failed to vote on request for " << gtid << ": "
-                << -ret << " (" << ::strerror(-ret) << "). "
+                << -ret << " (" << gcs_error_str(-ret) << "). "
                 "Assuming inconsistency";
             goto fail;
         }
@@ -3075,8 +3076,9 @@ void galera::ReplicatorSMM::process_join(wsrep_seqno_t seqno_j,
     if (seqno_j < 0 && S_JOINING == state_())
     {
         // #595, @todo: find a way to re-request state transfer
-        log_fatal << "Failed to receive state transfer: " << seqno_j
-                  << " (" << strerror (-seqno_j) << "), need to restart.";
+        log_fatal << "Failed to receive state transfer: " << seqno_j << " ("
+                  << gcs_state_transfer_error_str(-seqno_j)
+                  << "), need to restart.";
         abort();
     }
     else
@@ -3191,7 +3193,7 @@ void galera::ReplicatorSMM::desync()
 
     if (ret)
     {
-        gu_throw_error (-ret) << "Node desync failed.";
+        gu_throw_error(-ret) << gcs_error_str(-ret);
     }
 }