Hi Thien,
Ack.
Thanks, Vu
________________________________
From: Thien Minh Huynh <thien.m.hu...@dektech.com.au>
Sent: Friday, February 28, 2020 10:17 AM
To: Vu Minh Nguyen <vu.m.ngu...@dektech.com.au>
Cc: opensaf-devel@lists.sourceforge.net <opensaf-devel@lists.sourceforge.net>;
Thien Minh Huynh <thien.m.hu...@dektech.com.au>
Subject: [PATCH 1/1] log: standby node is rebooted when nfs is unresponsive
[#3161]
Adding 3 checkpoint messages: `CkptPushAsync`, `CkptPopAsync`
and `CkptPopAndWriteAsync` into `lgsv_ckpt_msg_v9_t`
Rename file lgs_mbcsv_cache.cc,h to lgs_mbcsv_v8.cc,h
---
src/log/Makefile.am | 4 ++--
src/log/logd/lgs_cache.cc | 2 +-
src/log/logd/lgs_cache.h | 2 +-
src/log/logd/lgs_mbcsv.cc | 2 +-
.../{lgs_mbcsv_cache.cc => lgs_mbcsv_v8.cc} | 2 +-
.../{lgs_mbcsv_cache.h => lgs_mbcsv_v8.h} | 6 +++---
src/log/logd/lgs_mbcsv_v9.cc | 19 +++++++++++++++++++
src/log/logd/lgs_mbcsv_v9.h | 4 ++++
8 files changed, 32 insertions(+), 9 deletions(-)
rename src/log/logd/{lgs_mbcsv_cache.cc => lgs_mbcsv_v8.cc} (99%)
rename src/log/logd/{lgs_mbcsv_cache.h => lgs_mbcsv_v8.h} (96%)
diff --git a/src/log/Makefile.am b/src/log/Makefile.am
index 2dad3cfb1..df061e6eb 100644
--- a/src/log/Makefile.am
+++ b/src/log/Makefile.am
@@ -98,7 +98,7 @@ noinst_HEADERS += \
src/log/logd/lgs_common.h \
src/log/logd/lgs_amf.h \
src/log/logd/lgs_cache.h \
- src/log/logd/lgs_mbcsv_cache.h
+ src/log/logd/lgs_mbcsv_v8.h
bin_PROGRAMS += bin/saflogger
@@ -162,7 +162,7 @@ bin_osaflogd_SOURCES = \
src/log/logd/lgs_nildest.cc \
src/log/logd/lgs_unixsock_dest.cc \
src/log/logd/lgs_cache.cc \
- src/log/logd/lgs_mbcsv_cache.cc
+ src/log/logd/lgs_mbcsv_v8.cc
bin_osaflogd_LDADD = \
lib/libosaf_common.la \
diff --git a/src/log/logd/lgs_cache.cc b/src/log/logd/lgs_cache.cc
index 81f64225d..d6a282e48 100644
--- a/src/log/logd/lgs_cache.cc
+++ b/src/log/logd/lgs_cache.cc
@@ -18,7 +18,7 @@
#include "log/logd/lgs_cache.h"
#include "log/logd/lgs_dest.h"
-#include "log/logd/lgs_mbcsv_cache.h"
+#include "log/logd/lgs_mbcsv_v8.h"
#include "log/logd/lgs_evt.h"
#include "log/logd/lgs_evt.h"
#include "log/logd/lgs_mbcsv.h"
diff --git a/src/log/logd/lgs_cache.h b/src/log/logd/lgs_cache.h
index 9d2d29726..a5d6181fb 100644
--- a/src/log/logd/lgs_cache.h
+++ b/src/log/logd/lgs_cache.h
@@ -26,7 +26,7 @@
#include <memory>
#include "log/logd/lgs.h"
-#include "log/logd/lgs_mbcsv_cache.h"
+#include "log/logd/lgs_mbcsv_v8.h"
#include "base/macros.h"
// This atomic variable stores the readiness status of file hdle thread.
diff --git a/src/log/logd/lgs_mbcsv.cc b/src/log/logd/lgs_mbcsv.cc
index 7150e74dd..6ec004f0a 100644
--- a/src/log/logd/lgs_mbcsv.cc
+++ b/src/log/logd/lgs_mbcsv.cc
@@ -24,12 +24,12 @@
#include "osaf/immutil/immutil.h"
#include "log/logd/lgs_dest.h"
#include "log/logd/lgs_mbcsv_v9.h"
+#include "log/logd/lgs_mbcsv_v8.h"
#include "log/logd/lgs_mbcsv_v6.h"
#include "log/logd/lgs_mbcsv_v5.h"
#include "log/logd/lgs_mbcsv_v3.h"
#include "log/logd/lgs_mbcsv_v2.h"
#include "log/logd/lgs_mbcsv_v1.h"
-#include "log/logd/lgs_mbcsv_cache.h"
#include "log/logd/lgs_recov.h"
#include "log/logd/lgs_cache.h"
/*
diff --git a/src/log/logd/lgs_mbcsv_cache.cc b/src/log/logd/lgs_mbcsv_v8.cc
similarity index 99%
rename from src/log/logd/lgs_mbcsv_cache.cc
rename to src/log/logd/lgs_mbcsv_v8.cc
index b190c5bea..289a4f610 100644
--- a/src/log/logd/lgs_mbcsv_cache.cc
+++ b/src/log/logd/lgs_mbcsv_v8.cc
@@ -15,7 +15,7 @@
*
*/
-#include "log/logd/lgs_mbcsv_cache.h"
+#include "log/logd/lgs_mbcsv_v8.h"
#include "log/logd/lgs_cache.h"
uint32_t EncodeDecodePushAsync(EDU_HDL* edu_hdl, EDU_TKN* edu_tkn,
diff --git a/src/log/logd/lgs_mbcsv_cache.h b/src/log/logd/lgs_mbcsv_v8.h
similarity index 96%
rename from src/log/logd/lgs_mbcsv_cache.h
rename to src/log/logd/lgs_mbcsv_v8.h
index a6f5f440b..b07222962 100644
--- a/src/log/logd/lgs_mbcsv_cache.h
+++ b/src/log/logd/lgs_mbcsv_v8.h
@@ -15,8 +15,8 @@
*
*/
-#ifndef LOG_LOGD_LGS_MBCSV_CACHE_H_
-#define LOG_LOGD_LGS_MBCSV_CACHE_H_
+#ifndef LOG_LOGD_LGS_MBCSV_V8_H_
+#define LOG_LOGD_LGS_MBCSV_V8_H_
#include "log/logd/lgs_mbcsv_v2.h"
#include "log/logd/lgs_mbcsv_v3.h"
@@ -107,4 +107,4 @@ void Dump(const CkptPushAsync* data);
extern uint32_t test_counter;
#endif
-#endif // LOG_LOGD_LGS_MBCSV_CACHE_H_
+#endif // LOG_LOGD_LGS_MBCSV_V8_H_
diff --git a/src/log/logd/lgs_mbcsv_v9.cc b/src/log/logd/lgs_mbcsv_v9.cc
index 9829ecb31..b1e2d637e 100644
--- a/src/log/logd/lgs_mbcsv_v9.cc
+++ b/src/log/logd/lgs_mbcsv_v9.cc
@@ -218,6 +218,25 @@ uint32_t edp_ed_ckpt_msg_v9(EDU_HDL *edu_hdl, EDU_TKN
*edu_tkn, NCSCONTEXT ptr,
(reinterpret_cast<lgsv_ckpt_msg_v9_t *>(0))->ckpt_rec.lgs_cfg,
0, nullptr},
+ /* Push a write async */
+ {EDU_EXEC, EncodeDecodePushAsync, 0, 0, static_cast<int>(EDU_EXIT),
+ (int64_t) &
+ (reinterpret_cast<lgsv_ckpt_msg_v9_t *>(0))->ckpt_rec.push_async,
+ 0, nullptr},
+
+ /* Pop a write async */
+ {EDU_EXEC, EncodeDecodePopAsync, 0, 0, static_cast<int>(EDU_EXIT),
+ (int64_t) &
+ (reinterpret_cast<lgsv_ckpt_msg_v9_t *>(0))->ckpt_rec.pop_async,
+ 0, nullptr},
+
+ /* Pop a write a sync and after done processing the write request */
+ {EDU_EXEC, EncodeDecodePopAndWriteAsync, 0, 0,
+ static_cast<int>(EDU_EXIT),
+ (int64_t) & (reinterpret_cast<lgsv_ckpt_msg_v9_t *>(0))
+ ->ckpt_rec.pop_and_write_async,
+ 0, nullptr},
+
{EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
};
diff --git a/src/log/logd/lgs_mbcsv_v9.h b/src/log/logd/lgs_mbcsv_v9.h
index 7c3ef9722..f23ff3d43 100644
--- a/src/log/logd/lgs_mbcsv_v9.h
+++ b/src/log/logd/lgs_mbcsv_v9.h
@@ -23,6 +23,7 @@
#include "log/logd/lgs_mbcsv_v2.h"
#include "log/logd/lgs_mbcsv_v5.h"
#include "log/logd/lgs_mbcsv_v6.h"
+#include "log/logd/lgs_mbcsv_v8.h"
typedef struct {
char *name;
@@ -53,6 +54,9 @@ typedef struct {
lgs_ckpt_stream_close_v2_t stream_close;
lgs_ckpt_stream_cfg_v4_t stream_cfg;
lgs_ckpt_lgs_cfg_v5_t lgs_cfg;
+ CkptPushAsync push_async;
+ CkptPopAsync pop_async;
+ CkptPopAndWriteAsync pop_and_write_async;
} ckpt_rec;
} lgsv_ckpt_msg_v9_t;
--
2.17.1
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
