(incubator-resilientdb) branch recovery_ckpt updated (85af6ebf -> e04d4632)

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

junchao pushed a change to branch recovery_ckpt
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git


    from 85af6ebf update vc
     add 89361043 Fix Memdb with seq 0 (#219)
     new e04d4632 update vc

The 1 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:
 platform/consensus/ordering/pbft/checkpoint_manager.cpp | 13 +++++++++++++
 platform/consensus/ordering/pbft/checkpoint_manager.h   |  3 +++
 service/tools/config/interface/service.config           |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

(incubator-resilientdb) 01/01: update vc

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

junchao pushed a commit to branch recovery_ckpt
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git

commit e04d4632900233b857d6d200ba1ecbe795badcb8
Merge: 85af6ebf 89361043
Author: Ubuntu <ic...@gmail.com>
AuthorDate: Sun Jan 4 17:15:11 2026 +0000

    update vc

 platform/consensus/ordering/pbft/checkpoint_manager.cpp | 13 +++++++++++++
 platform/consensus/ordering/pbft/checkpoint_manager.h   |  3 +++
 service/tools/config/interface/service.config           |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --cc platform/consensus/ordering/pbft/checkpoint_manager.cpp
index c23641bf,2125b049..da25c4e8
--- a/platform/consensus/ordering/pbft/checkpoint_manager.cpp
+++ b/platform/consensus/ordering/pbft/checkpoint_manager.cpp
@@@ -279,6 -239,6 +279,15 @@@ void CheckPointManager::SetTimeoutHandl
  void CheckPointManager::TimeoutHandler() {
    if (timeout_handler_) {
      timeout_handler_(0);
++<<<<<<< HEAD
++=======
++  }
++}
++
++void CheckPointManager::TimeoutHandler(uint32_t replica) {
++  if (timeout_handler_) {
++    timeout_handler_(replica);
++>>>>>>> master
    }
  }
  
@@@ -308,13 -259,9 +317,17 @@@ int CheckPointManager::ProcessStatusSyn
    }
    uint64_t seq = checkpoint_data.seq();
    uint32_t sender_id = request->sender_id();
 +  uint32_t primary_id = checkpoint_data.primary_id();
 +  uint32_t view = checkpoint_data.view();
 +
    status_[sender_id] = seq;
    last_update_time_[sender_id] = time(nullptr);
++<<<<<<< HEAD
 +  view_status_[sender_id] = std::make_pair(primary_id, view);
 +  LOG(ERROR) << " received from :" << sender_id << " commit status:" << seq<<" primary:"<<primary_id<<" view:"<<view;
++=======
+   LOG(ERROR) << " received from :" << sender_id << " commit status:" << seq;
++>>>>>>> master
    return 0;
  }
  
diff --cc platform/consensus/ordering/pbft/checkpoint_manager.h
index 88db50ab,d1c33aa4..e3feefec
--- a/platform/consensus/ordering/pbft/checkpoint_manager.h
+++ b/platform/consensus/ordering/pbft/checkpoint_manager.h
@@@ -103,7 -90,6 +103,10 @@@ class CheckPointManager : public CheckP
    void SyncStatus();
    void StatusProcess();
    void CheckStatus(uint64_t last_seq);
++<<<<<<< HEAD
 +  void CheckSysStatus();
++=======
++>>>>>>> master
    void CheckHealthy();
  
   protected: