Handle background thread when updating/removing Aviso or Remote attri…

…bute
ecmwf · May 15, 2024 · fcd01c1 · fcd01c1
1 parent ec4780e
commit fcd01c1
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 9 deletions.
diff --git a/libs/base/src/ecflow/base/cts/user/AlterCmd.cpp b/libs/base/src/ecflow/base/cts/user/AlterCmd.cpp
@@ -508,12 +508,12 @@ STC_Cmd_ptr AlterCmd::doHandleRequest(AbstractServer* as) const {
                     node->addDay(DayAttr::create(name_));
                     break;
                 case AlterCmd::ADD_AVISO: {
-                    auto aviso = AvisoParser::parse_aviso_line(value_, name_);
+                    auto aviso = AvisoParser::parse_aviso_line(value_, name_, node.get());
                     node->addAviso(aviso);
                     break;
                 }
                 case AlterCmd::ADD_MIRROR: {
-                    auto mirror = MirrorParser::parse_mirror_line(value_, name_);
+                    auto mirror = MirrorParser::parse_mirror_line(value_, name_, node.get());
                     node->addMirror(mirror);
                     break;
                 }

diff --git a/libs/node/src/ecflow/node/MirrorAttr.cpp b/libs/node/src/ecflow/node/MirrorAttr.cpp
@@ -39,7 +39,14 @@ MirrorAttr::MirrorAttr(Node* parent,
     if (!is_valid_name(name_)) {
         throw ecf::InvalidArgument(ecf::Message("Invalid MirrorAttr name :", name_));
     }
-};
+}
+
+MirrorAttr::~MirrorAttr() {
+    if (controller_ != nullptr) {
+        controller_->stop();
+        controller_.reset();
+    }
+}
 
 void MirrorAttr::poke() {
     ALOG(D, "**** Check Mirror attribute (name: " << name_ << ")");

diff --git a/libs/node/src/ecflow/node/MirrorAttr.hpp b/libs/node/src/ecflow/node/MirrorAttr.hpp
@@ -60,6 +60,7 @@ class MirrorAttr {
                remote_port_t remote_port,
                polling_t polling);
     MirrorAttr(const MirrorAttr& rhs) = default;
+    ~MirrorAttr();
 
     MirrorAttr& operator=(const MirrorAttr& rhs) = default;
 
@@ -71,6 +72,8 @@ class MirrorAttr {
     [[nodiscard]] inline const std::string& remote_port() const { return remote_port_; }
     [[nodiscard]] inline polling_t polling() const { return polling_; }
 
+    void set_parent(Node* parent) { parent_ = parent; }
+
     unsigned int state_change_no() const { return state_change_no_; }
 
     bool why(std::string& theReasonWhy) const;

diff --git a/libs/node/src/ecflow/node/NodeChange.cpp b/libs/node/src/ecflow/node/NodeChange.cpp
@@ -184,8 +184,12 @@ void Node::changeAviso(const std::string& name, const std::string& value, uint64
         throw std::runtime_error("Node::changeAviso: Could not find aviso " + name);
     }
 
-    *found = AvisoParser::parse_aviso_line(value, name);
-    found->set_revision(revision);
+    auto attr = AvisoParser::parse_aviso_line(value, name);
+    attr.set_revision(revision);
+
+    // The following delete/add enforces the reconfiguration of the attribute backend thread
+    this->deleteAviso(name); // delete the aviso if it exists (to avoid duplicates
+    this->addAviso(attr);
 
     state_change_no_ = Ecf::incr_state_change_no();
 }
@@ -197,7 +201,11 @@ void Node::changeMirror(const std::string& name, const std::string& value) {
         throw std::runtime_error("Node::changeMirror: Could not find mirror " + name);
     }
 
-    *found = MirrorParser::parse_mirror_line(value, name);
+    auto attr = MirrorParser::parse_mirror_line(value, name, this);
+
+    // The following delete/add enforces the reconfiguration of the attribute backend thread
+    this->deleteMirror(name); // delete the mirror if it exists (to avoid duplicates
+    this->addMirror(attr);
 
     state_change_no_ = Ecf::incr_state_change_no();
 }

diff --git a/libs/node/src/ecflow/node/parser/AvisoParser.cpp b/libs/node/src/ecflow/node/parser/AvisoParser.cpp
@@ -37,8 +37,12 @@ ecf::AvisoAttr AvisoParser::parse_aviso_line(const std::string& line) {
 }
 
 ecf::AvisoAttr AvisoParser::parse_aviso_line(const std::string& line, const std::string& name) {
+    return parse_aviso_line(line, name, nullptr);
+}
+
+ecf::AvisoAttr AvisoParser::parse_aviso_line(const std::string& line, const std::string& name, Node* parent) {
     auto updated_line = line + " --name " + name;
-    return parse_aviso_line(updated_line, nullptr);
+    return parse_aviso_line(updated_line, parent);
 }
 
 ecf::AvisoAttr AvisoParser::parse_aviso_line(const std::string& line, Node* parent) {

diff --git a/libs/node/src/ecflow/node/parser/AvisoParser.hpp b/libs/node/src/ecflow/node/parser/AvisoParser.hpp
@@ -47,6 +47,7 @@ class AvisoParser : public Parser {
 
     static ecf::AvisoAttr parse_aviso_line(const std::string& line);
     static ecf::AvisoAttr parse_aviso_line(const std::string& line, const std::string& name);
+    static ecf::AvisoAttr parse_aviso_line(const std::string& line, const std::string& name, Node* parent);
     static ecf::AvisoAttr parse_aviso_line(const std::string& line, Node* parent);
 
     explicit AvisoParser(DefsStructureParser* p) : Parser(p) {}

diff --git a/libs/node/src/ecflow/node/parser/MirrorParser.cpp b/libs/node/src/ecflow/node/parser/MirrorParser.cpp
@@ -38,8 +38,12 @@ ecf::MirrorAttr MirrorParser::parse_mirror_line(const std::string& line) {
 }
 
 ecf::MirrorAttr MirrorParser::parse_mirror_line(const std::string& line, const std::string& name) {
+    return parse_mirror_line(line, name, nullptr);
+}
+
+ecf::MirrorAttr MirrorParser::parse_mirror_line(const std::string& line, const std::string& name, Node* parent) {
     auto updated_line = line + " --name " + name;
-    return parse_mirror_line(updated_line, nullptr);
+    return parse_mirror_line(updated_line, parent);
 }
 
 ecf::MirrorAttr MirrorParser::parse_mirror_line(const std::string& line, Node* parent) {
@@ -78,7 +82,7 @@ ecf::MirrorAttr MirrorParser::parse_mirror_line(const std::string& line, Node* p
 
 bool MirrorParser::doParse(const std::string& line, std::vector<std::string>& lineTokens) {
     if (nodeStack().empty()) {
-        throw std::runtime_error("AvisoParser::doParse: Could not add aviso as node stack is empty at line: " + line);
+        throw std::runtime_error("MirrorParser::doParse: Could not add 'mirror' as node stack is empty at line: " + line);
     }
 
     Node* parent = nodeStack_top();

diff --git a/libs/node/src/ecflow/node/parser/MirrorParser.hpp b/libs/node/src/ecflow/node/parser/MirrorParser.hpp
@@ -45,6 +45,7 @@ class MirrorParser : public Parser {
 
     static ecf::MirrorAttr parse_mirror_line(const std::string& line);
     static ecf::MirrorAttr parse_mirror_line(const std::string& line, const std::string& name);
+    static ecf::MirrorAttr parse_mirror_line(const std::string& line, const std::string& name, Node* parent);
     static ecf::MirrorAttr parse_mirror_line(const std::string& line, Node* parent);
 
     explicit MirrorParser(DefsStructureParser* p) : Parser(p) {}