Redis: First attempt of a reconnect config dump

refs #5072
refs #4991

diff --git a/lib/redis/CMakeLists.txt b/lib/redis/CMakeLists.txt
index 1d90dd39f36cd1840fb53241e50b74382ed97214..936f291602bed51c5db3a76caa30e16c8266cf63 100644 (file)
--- a/lib/redis/CMakeLists.txt
+++ b/lib/redis/CMakeLists.txt
@@ -18,7 +18,7 @@
 mkclass_target(rediswriter.ti rediswriter.tcpp rediswriter.thpp)
 
 set(redis_SOURCES
-  rediswriter.cpp rediswriter.thpp
+  rediswriter.cpp rediswriter-config.cpp rediswriter.thpp
 )
 
 if(ICINGA2_UNITY_BUILD)

diff --git a/lib/redis/rediswriter-config.cpp b/lib/redis/rediswriter-config.cpp
new file mode 100644 (file)
index 0000000..300ce95
--- /dev/null
+++ b/lib/redis/rediswriter-config.cpp
@@ -0,0 +1,148 @@
+/******************************************************************************
+ * Icinga 2                                                                   *
+ * Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)  *
+ *                                                                            *
+ * This program is free software; you can redistribute it and/or              *
+ * modify it under the terms of the GNU General Public License                *
+ * as published by the Free Software Foundation; either version 2             *
+ * of the License, or (at your option) any later version.                     *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful,            *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ * GNU General Public License for more details.                               *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License          *
+ * along with this program; if not, write to the Free Software Foundation     *
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
+ ******************************************************************************/
+
+#include "redis/rediswriter.hpp"
+#include "base/json.hpp"
+#include "base/logger.hpp"
+#include "base/serializer.hpp"
+
+using namespace icinga;
+
+/*
+- icinga:config:<type> as hash
+key: sha1 checksum(name)
+value: JsonEncode(Serialize(object, FAConfig)) + config_checksum
+
+Diff between calculated config_checksum and Redis json config_checksum
+Alternative: Replace into.
+
+
+- icinga:status:<type> as hash
+key: sha1 checksum(name)
+value: JsonEncode(Serialize(object, FAState))
+*/
+
+//TODO: OnActiveChanged handling.
+void RedisWriter::UpdateAllConfigObjects(void)
+{
+
+       //TODO: Just use config types
+       for (const Type::Ptr& type : Type::GetAllTypes()) {
+
+               String typeName = type->GetName();
+
+               /* replace into aka delete insert is faster than a full diff */
+               Log(LogInformation, "RedisWriter")
+                   << "Flushing icinga:config:" << typeName << " before config dump.";
+
+               redisReply *reply = reinterpret_cast<redisReply *>(redisCommand(m_Context, "DEL icinga:config:%s", typeName.CStr()));
+
+               if (!reply) {
+                       redisFree(m_Context);
+                       m_Context = NULL;
+                       return;
+               }
+
+               if (reply->type == REDIS_REPLY_STATUS || reply->type == REDIS_REPLY_ERROR) {
+                       Log(LogInformation, "RedisWriter")
+                           << "DEL icinga:config:" << typeName << ": " << reply->str;
+               }
+
+               if (reply->type == REDIS_REPLY_ERROR) {
+                       freeReplyObject(reply);
+                       return;
+               }
+
+               freeReplyObject(reply);
+
+               /* fetch all objects and dump them */
+               ConfigType *ctype = dynamic_cast<ConfigType *>(type.get());
+
+               if (ctype) {
+                       for (const ConfigObject::Ptr& object : ctype->GetObjects()) {
+                               DumpConfigObject(object, typeName);
+                       }
+               }
+       }
+}
+
+void RedisWriter::DumpConfigObject(const ConfigObject::Ptr& object, const String& typeName)
+{
+       /* Serialize config object attributes */
+       Dictionary::Ptr objectAttrs = SerializeObjectAttrs(object, FAConfig);
+
+       String jsonBody = JsonEncode(objectAttrs);
+
+       //TODO: checksum
+       String objectName = object->GetName();
+
+       redisReply *reply = reinterpret_cast<redisReply *>(redisCommand(m_Context, "HSET icinga:config:%s %s %s", typeName.CStr(), objectName.CStr(), jsonBody.CStr()));
+
+       if (!reply) {
+               redisFree(m_Context);
+               m_Context = NULL;
+               return;
+       }
+
+       if (reply->type == REDIS_REPLY_STATUS || reply->type == REDIS_REPLY_ERROR) {
+               Log(LogInformation, "RedisWriter")
+                   << "HSET icinga:config:" << typeName << " " << objectName << " " << jsonBody << ": " << reply->str;
+       }
+
+       if (reply->type == REDIS_REPLY_ERROR) {
+               freeReplyObject(reply);
+               return;
+       }
+
+       freeReplyObject(reply);
+}
+
+Dictionary::Ptr RedisWriter::SerializeObjectAttrs(const Object::Ptr& object, int fieldType)
+{
+       Type::Ptr type = object->GetReflectionType();
+
+       std::vector<int> fids;
+
+       for (int fid = 0; fid < type->GetFieldCount(); fid++) {
+               fids.push_back(fid);
+       }
+
+       Dictionary::Ptr resultAttrs = new Dictionary();
+
+       for (int& fid : fids)
+       {
+               Field field = type->GetFieldInfo(fid);
+
+               Value val = object->GetField(fid);
+
+               /* hide attributes which shouldn't be user-visible */
+               if (field.Attributes & FANoUserView)
+                       continue;
+
+               /* hide internal navigation fields */
+               if (field.Attributes & FANavigation && !(field.Attributes & (FAConfig | FAState)))
+                       continue;
+
+               Value sval = Serialize(val, fieldType);
+               resultAttrs->Set(field.Name, sval);
+       }
+
+       return resultAttrs;
+}
+

diff --git a/lib/redis/rediswriter.cpp b/lib/redis/rediswriter.cpp
index f96d306bff586980990b7b8917997063d5d9a998..f5f7e3ad581787e5c7bf301a8e5c4f1af55131d4 100644 (file)
--- a/lib/redis/rediswriter.cpp
+++ b/lib/redis/rediswriter.cpp
@@ -109,6 +109,9 @@ void RedisWriter::TryToReconnect(void)
 
                freeReplyObject(reply);
        }
+
+       /* Config dump */
+       UpdateAllConfigObjects();
 }
 
 void RedisWriter::UpdateSubscriptionsTimerHandler(void)

diff --git a/lib/redis/rediswriter.hpp b/lib/redis/rediswriter.hpp
index 51d9b7c4369e41810f0c2c178012a8b6f0ad6a58..e7892ac7e87d65dbb292d42237c6d0e6e77723bf 100644 (file)
--- a/lib/redis/rediswriter.hpp
+++ b/lib/redis/rediswriter.hpp
@@ -57,6 +57,11 @@ private:
        void UpdateSubscriptionsTimerHandler(void);
        void UpdateSubscriptions(void);
 
+       /* config dump */
+       void UpdateAllConfigObjects(void);
+       void DumpConfigObject(const ConfigObject::Ptr& object, const String& typeName);
+       static Dictionary::Ptr SerializeObjectAttrs(const Object::Ptr& object, int fieldType);
+
        Timer::Ptr m_ReconnectTimer;
        Timer::Ptr m_SubscriptionTimer;
        WorkQueue m_WorkQueue;