B OpenNebula#5081: oned monitoring API bug with PostgreSQL (OpenNebul…

…a#5087) Signed-off-by: Romanov Andrey Grigorievich <[email protected]> Co-authored-by: Romanov Andrey Grigorievich <[email protected]>
storpool · Nov 24, 2020 · 14b7402 · 14b7402
1 parent 2305581
commit 14b7402
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/vm/VirtualMachinePool.cc b/src/vm/VirtualMachinePool.cc
@@ -340,12 +340,11 @@ int VirtualMachinePool::dump_monitoring(
 
     cmd << "SELECT " << one_db::vm_monitor_table << ".body FROM "
         << one_db::vm_monitor_table
-        << " INNER JOIN " << one_db::vm_table
-        << " WHERE vmid = oid";
+        << " INNER JOIN " << one_db::vm_table    << " ON vmid = oid";
 
     if ( !where.empty() )
     {
-        cmd << " AND " << where;
+        cmd << " WHERE " << where;
     }
 
     cmd << " ORDER BY vmid, " << one_db::vm_monitor_table << ".last_poll;";