src/amf/amfd/imm.cc | 28 +++++++++++++++++++++++-----
src/amf/amfd/imm.h | 2 ++
2 files changed, 25 insertions(+), 5 deletions(-)
After a cold sync, the standby job queue size can exceed the current limit of
200.
This results in the emptying of the entire queue at standby.
Potentially, some IMM updates are not done, as all jobs will be deleted during
a failover if the size is exceeded. This is especially important for updates
that
the old 'active' could not perform in time during the failover.
This patch attempts to reduce the occurrence of this by increasing the max size,
and only trimming the queue to half the maximum size. The updates that must be
done
are likely to be located towards the end of the queue, and these are kept.
diff --git a/src/amf/amfd/imm.cc b/src/amf/amfd/imm.cc
--- a/src/amf/amfd/imm.cc
+++ b/src/amf/amfd/imm.cc
@@ -126,7 +126,7 @@ static char *StrDup(const char *s)
std::strcpy(c,s);
return c;
}
-uint32_t const MAX_JOB_SIZE_AT_STANDBY = 200;
+uint32_t const MAX_JOB_SIZE_AT_STANDBY = 500;
//
Job::~Job()
@@ -390,10 +390,15 @@ Job* Fifo::dequeue()
*/
void check_and_flush_job_queue_standby_amfd(void)
{
- if (Fifo::size() >= MAX_JOB_SIZE_AT_STANDBY) {
- TRACE("Emptying imm job queue of size:%u",Fifo::size());
- Fifo::empty();
- }
+ TRACE_ENTER();
+
+ if (Fifo::size() >= MAX_JOB_SIZE_AT_STANDBY) {
+ const uint32_t new_size = MAX_JOB_SIZE_AT_STANDBY / 2;
+ LOG_WA("Reducing job queue of size:%u to
%u",Fifo::size(),new_size);
+ Fifo::trim_to_size(new_size);
+ }
+
+ TRACE_LEAVE();
}
//
@@ -468,6 +473,19 @@ uint32_t Fifo::size()
return job_.size();
}
+void Fifo::trim_to_size(const uint32_t size)
+{
+ Job *ajob;
+
+ TRACE_ENTER();
+
+ while (job_.size() > size && (ajob = dequeue()) != nullptr) {
+ delete ajob;
+ }
+
+ TRACE_LEAVE();
+}
+
//
std::queue<Job*> Fifo::job_;
//
diff --git a/src/amf/amfd/imm.h b/src/amf/amfd/imm.h
--- a/src/amf/amfd/imm.h
+++ b/src/amf/amfd/imm.h
@@ -151,6 +151,8 @@ public:
static void empty();
static uint32_t size();
+
+ static void trim_to_size(const uint32_t size);
private:
static std::queue<Job*> job_;
};
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
