Fix incorrect IDO queries

fixes #7634

diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp
index 57e680fbffbbf325fa6e1d2caa8d3dc58142ac18..6aa4ec9f40a2668c86e217edb35e6aa53bea399f 100644 (file)
--- a/lib/db_ido/dbevents.cpp
+++ b/lib/db_ido/dbevents.cpp
@@ -97,8 +97,10 @@ void DbEvents::NextCheckChangedHandler(const Checkable::Ptr& checkable, double n
        else
                query1.Table = "hoststatus";
 
-       query1.Type = DbQueryUpdate;
+       query1.Type = DbQueryInsert | DbQueryUpdate;
        query1.Category = DbCatState;
+       query1.StatusUpdate = true;
+       query1.Object = DbObject::GetOrCreateByObject(checkable);
 
        Dictionary::Ptr fields1 = new Dictionary();
        fields1->Set("next_check", DbValue::FromTimestamp(nextCheck));
@@ -128,8 +130,10 @@ void DbEvents::FlappingChangedHandler(const Checkable::Ptr& checkable, FlappingS
        else
                query1.Table = "hoststatus";
 
-       query1.Type = DbQueryUpdate;
+       query1.Type = DbQueryInsert | DbQueryUpdate;
        query1.Category = DbCatState;
+       query1.StatusUpdate = true;
+       query1.Object = DbObject::GetOrCreateByObject(checkable);
 
        Dictionary::Ptr fields1 = new Dictionary();
        fields1->Set("is_flapping", CompatUtility::GetCheckableIsFlapping(checkable));
@@ -164,8 +168,10 @@ void DbEvents::LastNotificationChangedHandler(const Notification::Ptr& notificat
        else
                query1.Table = "hoststatus";
 
-       query1.Type = DbQueryUpdate;
+       query1.Type = DbQueryInsert | DbQueryUpdate;
        query1.Category = DbCatState;
+       query1.StatusUpdate = true;
+       query1.Object = DbObject::GetOrCreateByObject(checkable);
 
        Dictionary::Ptr fields1 = new Dictionary();
        fields1->Set("last_notification", DbValue::FromTimestamp(now_bag.first));
@@ -223,8 +229,10 @@ void DbEvents::EnableChangedHandlerInternal(const Checkable::Ptr& checkable, boo
        else
                query1.Table = "hoststatus";
 
-       query1.Type = DbQueryUpdate;
+       query1.Type = DbQueryInsert | DbQueryUpdate;
        query1.Category = DbCatState;
+       query1.StatusUpdate = true;
+       query1.Object = DbObject::GetOrCreateByObject(checkable);
 
        Dictionary::Ptr fields1 = new Dictionary();
 
@@ -618,7 +626,10 @@ void DbEvents::TriggerDowntime(const Checkable::Ptr& checkable, const Downtime::
        else
                query4.Table = "hoststatus";
 
-       query4.Type = DbQueryUpdate;
+       query4.Type = DbQueryInsert | DbQueryUpdate;
+       query4.Category = DbCatState;
+       query4.StatusUpdate = true;
+       query4.Object = DbObject::GetOrCreateByObject(checkable);
 
        Dictionary::Ptr fields4 = new Dictionary();
        fields4->Set("scheduled_downtime_depth", checkable->GetDowntimeDepth());
@@ -707,8 +718,10 @@ void DbEvents::AddAcknowledgementInternal(const Checkable::Ptr& checkable, Ackno
        else
                query1.Table = "hoststatus";
 
-       query1.Type = DbQueryUpdate;
-       query1.Category = DbCatAcknowledgement;
+       query1.Type = DbQueryInsert | DbQueryUpdate;
+       query1.Category = DbCatState;
+       query1.StatusUpdate = true;
+       query1.Object = DbObject::GetOrCreateByObject(checkable);
 
        Dictionary::Ptr fields1 = new Dictionary();
        fields1->Set("acknowledgement_type", type);

diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp
index 6a7d19892154ec5510f380ce996c0d9d1f8c9ef9..28fbf8aee6992633a3aaa9fa0944499189b48745 100644 (file)
--- a/lib/db_ido/dbobject.cpp
+++ b/lib/db_ido/dbobject.cpp
@@ -254,7 +254,6 @@ void DbObject::SendVarsStatusUpdate(void)
                        query.Table = "customvariablestatus";
                        query.Type = DbQueryInsert | DbQueryUpdate;
                        query.Category = DbCatState;
-                       query.StatusUpdate = true;
                        query.Fields = fields;
 
                        query.WhereCriteria = new Dictionary();

diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
index 5b39ac7e13a558f05df79ff8316a5aebae4fe8b9..9bb7fcdbabb6bb7e6d7333b2e60a579eda437ba3 100644 (file)
--- a/lib/db_ido/hostdbobject.cpp
+++ b/lib/db_ido/hostdbobject.cpp
@@ -143,8 +143,11 @@ Dictionary::Ptr HostDbObject::GetStatusFields(void) const
        fields->Set("next_notification", DbValue::FromTimestamp(CompatUtility::GetCheckableNotificationNextNotification(host)));
        fields->Set("no_more_notifications", Empty);
        fields->Set("notifications_enabled", CompatUtility::GetCheckableNotificationsEnabled(host));
-       fields->Set("problem_has_been_acknowledged", CompatUtility::GetCheckableProblemHasBeenAcknowledged(host));
-       fields->Set("acknowledgement_type", CompatUtility::GetCheckableAcknowledgementType(host));
+       {
+               ObjectLock olock(host);
+               fields->Set("problem_has_been_acknowledged", CompatUtility::GetCheckableProblemHasBeenAcknowledged(host));
+               fields->Set("acknowledgement_type", CompatUtility::GetCheckableAcknowledgementType(host));
+       }
        fields->Set("current_notification_number", CompatUtility::GetCheckableNotificationNotificationNumber(host));
        fields->Set("passive_checks_enabled", CompatUtility::GetCheckablePassiveChecksEnabled(host));
        fields->Set("active_checks_enabled", CompatUtility::GetCheckableActiveChecksEnabled(host));

diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index d5ecfc7113d47b5e92ad6e13312df6dae638585c..e8df833930c934b1c838a44071a5cd105d743b1c 100644 (file)
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -139,8 +139,11 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields(void) const
        fields->Set("next_notification", DbValue::FromTimestamp(CompatUtility::GetCheckableNotificationNextNotification(service)));
        fields->Set("no_more_notifications", Empty);
        fields->Set("notifications_enabled", CompatUtility::GetCheckableNotificationsEnabled(service));
-       fields->Set("problem_has_been_acknowledged", CompatUtility::GetCheckableProblemHasBeenAcknowledged(service));
-       fields->Set("acknowledgement_type", CompatUtility::GetCheckableAcknowledgementType(service));
+       {
+               ObjectLock olock(service);
+               fields->Set("problem_has_been_acknowledged", CompatUtility::GetCheckableProblemHasBeenAcknowledged(service));
+               fields->Set("acknowledgement_type", CompatUtility::GetCheckableAcknowledgementType(service));
+       }
        fields->Set("current_notification_number", CompatUtility::GetCheckableNotificationNotificationNumber(service));
        fields->Set("passive_checks_enabled", CompatUtility::GetCheckablePassiveChecksEnabled(service));
        fields->Set("active_checks_enabled", CompatUtility::GetCheckableActiveChecksEnabled(service));

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index 902a8c2d36b51a5fac7553041a72cb57ae50cf78..68da0bb9ef5387e8229f7a62c061ea425c33b5f8 100644 (file)
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -628,8 +628,6 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, DbQueryType
                        hasid = GetConfigUpdate(query.Object);
                else if (query.StatusUpdate)
                        hasid = GetStatusUpdate(query.Object);
-               else
-                       ASSERT(!"Invalid query flags.");
 
                if (!hasid)
                        upsert = true;
@@ -703,14 +701,12 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, DbQueryType
                return;
        }
 
-       if (query.Object) {
-               if (query.ConfigUpdate)
+       if (type == DbQueryInsert && query.Object) {
+               if (query.ConfigUpdate) {
+                       SetInsertID(query.Object, GetLastInsertID());
                        SetConfigUpdate(query.Object, true);
-               else if (query.StatusUpdate)
+               } else if (query.StatusUpdate)
                        SetStatusUpdate(query.Object, true);
-
-               if (type == DbQueryInsert && query.ConfigUpdate)
-                       SetInsertID(query.Object, GetLastInsertID());
        }
 
        if (type == DbQueryInsert && query.Table == "notifications" && query.NotificationObject) { // FIXME remove hardcoded table name

diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index ee2d7357d5cd98c127f39db339dc4aa3bd16b946..74fc58f0a29d876822ad97e31e7657b8d9994fdc 100644 (file)
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -698,20 +698,18 @@ void IdoPgsqlConnection::InternalExecuteQuery(const DbQuery& query, DbQueryType
                return;
        }
 
-       if (query.Object) {
-               if (query.ConfigUpdate)
-                       SetConfigUpdate(query.Object, true);
-               else if (query.StatusUpdate)
-                       SetStatusUpdate(query.Object, true);
-
-               if (type == DbQueryInsert && query.ConfigUpdate) {
+       if (type == DbQueryInsert && query.Object) {
+               if (query.ConfigUpdate) {
                        String idField = query.IdColumn;
 
                        if (idField.IsEmpty())
                                idField = query.Table.SubStr(0, query.Table.GetLength() - 1) + "_id";
 
                        SetInsertID(query.Object, GetSequenceValue(GetTablePrefix() + query.Table, idField));
-               }
+
+                       SetConfigUpdate(query.Object, true);
+               } else if (query.StatusUpdate)
+                       SetStatusUpdate(query.Object, true);
        }
 
        if (type == DbQueryInsert && query.Table == "notifications" && query.NotificationObject) { // FIXME remove hardcoded table name