Eli Mesika has uploaded a new change for review. Change subject: core: Upgrade - Error Can't start the ovirt... ......................................................................
core: Upgrade - Error Can't start the ovirt... Upgrade - Error Can't start the ovirt-engine-dwhd service Adding _updated field to the following tables: vds_interface_statistics vm_interface_statistics vm_statistics vds_statistics disk_image_dynamic storage_domain_dynamic This field will be updated with the current time-stamp and will be available for history queries Those fields will be included by the dwh views and used from the reports. Change-Id: Ie8f39b5cdc3771f438f9c61897cb0242e8bb6c90 Signed-off-by: Eli Mesika <emes...@redhat.com> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=918152 --- M backend/manager/dbscripts/disk_image_dynamic_sp.sql M backend/manager/dbscripts/network_sp.sql M backend/manager/dbscripts/storages_san_sp.sql A backend/manager/dbscripts/upgrade/03_02_0490_add_update_column_to_statistics_tables.sql M backend/manager/dbscripts/vds_sp.sql M backend/manager/dbscripts/vms_sp.sql 6 files changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/12919/1 diff --git a/backend/manager/dbscripts/disk_image_dynamic_sp.sql b/backend/manager/dbscripts/disk_image_dynamic_sp.sql index 072f6b6..bb2e1f0 100644 --- a/backend/manager/dbscripts/disk_image_dynamic_sp.sql +++ b/backend/manager/dbscripts/disk_image_dynamic_sp.sql @@ -40,7 +40,7 @@ AS $procedure$ BEGIN UPDATE disk_image_dynamic - SET read_rate = v_read_rate,write_rate = v_write_rate,actual_size = v_actual_size,read_latency_seconds = v_read_latency_seconds,write_latency_seconds = v_write_latency_seconds,flush_latency_seconds = v_flush_latency_seconds + SET read_rate = v_read_rate,write_rate = v_write_rate,actual_size = v_actual_size,read_latency_seconds = v_read_latency_seconds,write_latency_seconds = v_write_latency_seconds,flush_latency_seconds = v_flush_latency_seconds, _update_date = LOCALTIMESTAMP WHERE image_id = v_image_id; END; $procedure$ LANGUAGE plpgsql; diff --git a/backend/manager/dbscripts/network_sp.sql b/backend/manager/dbscripts/network_sp.sql index 6f0ac8d..864073f 100644 --- a/backend/manager/dbscripts/network_sp.sql +++ b/backend/manager/dbscripts/network_sp.sql @@ -571,7 +571,7 @@ BEGIN UPDATE vm_interface_statistics SET rx_drop = v_rx_drop,rx_rate = v_rx_rate,tx_drop = v_tx_drop,tx_rate = v_tx_rate, - vm_id = v_vm_id,iface_status = v_iface_status + vm_id = v_vm_id,iface_status = v_iface_status, _update_date = LOCALTIMESTAMP WHERE id = v_id; END; $procedure$ LANGUAGE plpgsql; @@ -679,7 +679,7 @@ BEGIN UPDATE vds_interface_statistics SET rx_drop = v_rx_drop,rx_rate = v_rx_rate,tx_drop = v_tx_drop,tx_rate = v_tx_rate, - vds_id = v_vds_id,iface_status = v_iface_status + vds_id = v_vds_id,iface_status = v_iface_status, _update_date = LOCALTIMESTAMP WHERE id = v_id; END; $procedure$ LANGUAGE plpgsql; diff --git a/backend/manager/dbscripts/storages_san_sp.sql b/backend/manager/dbscripts/storages_san_sp.sql index 54f62d7..f36572a 100644 --- a/backend/manager/dbscripts/storages_san_sp.sql +++ b/backend/manager/dbscripts/storages_san_sp.sql @@ -149,7 +149,7 @@ AS $procedure$ BEGIN UPDATE storage_domain_dynamic - SET available_disk_size = v_available_disk_size,used_disk_size = v_used_disk_size + SET available_disk_size = v_available_disk_size,used_disk_size = v_used_disk_size, _update_date = LOCALTIMESTAMP WHERE id = v_id; END; $procedure$ LANGUAGE plpgsql; diff --git a/backend/manager/dbscripts/upgrade/03_02_0490_add_update_column_to_statistics_tables.sql b/backend/manager/dbscripts/upgrade/03_02_0490_add_update_column_to_statistics_tables.sql new file mode 100644 index 0000000..24ea743 --- /dev/null +++ b/backend/manager/dbscripts/upgrade/03_02_0490_add_update_column_to_statistics_tables.sql @@ -0,0 +1,6 @@ +select fn_db_add_column('vds_interface_statistics', 'update_date', 'TIMESTAMP WITH TIME ZONE default NULL'); +select fn_db_add_column('vm_interface_statistics', 'update_date', 'TIMESTAMP WITH TIME ZONE default NULL'); +select fn_db_add_column('vm_statistics', 'update_date', 'TIMESTAMP WITH TIME ZONE default NULL'); +select fn_db_add_column('vds_statistics', 'update_date', 'TIMESTAMP WITH TIME ZONE default NULL'); +select fn_db_add_column('disk_image_dynamic', 'update_date', 'TIMESTAMP WITH TIME ZONE default NULL'); +select fn_db_add_column('storage_domain_dynamic', 'update_date', 'TIMESTAMP WITH TIME ZONE default NULL'); diff --git a/backend/manager/dbscripts/vds_sp.sql b/backend/manager/dbscripts/vds_sp.sql index 32a4494..0e73f21 100644 --- a/backend/manager/dbscripts/vds_sp.sql +++ b/backend/manager/dbscripts/vds_sp.sql @@ -68,7 +68,7 @@ usage_network_percent = v_usage_network_percent, mem_available = v_mem_available,mem_shared = v_mem_shared, swap_free = v_swap_free,swap_total = v_swap_total,ksm_cpu_percent = v_ksm_cpu_percent, - ksm_pages = v_ksm_pages,ksm_state = v_ksm_state + ksm_pages = v_ksm_pages,ksm_state = v_ksm_state, _update_date = LOCALTIMESTAMP WHERE vds_id = v_vds_id; END; diff --git a/backend/manager/dbscripts/vms_sp.sql b/backend/manager/dbscripts/vms_sp.sql index 0d7773c..a99a501 100644 --- a/backend/manager/dbscripts/vms_sp.sql +++ b/backend/manager/dbscripts/vms_sp.sql @@ -157,7 +157,7 @@ UPDATE vm_statistics SET cpu_sys = v_cpu_sys,cpu_user = v_cpu_user,elapsed_time = v_elapsed_time, usage_cpu_percent = v_usage_cpu_percent,usage_mem_percent = v_usage_mem_percent, - usage_network_percent = v_usage_network_percent,disks_usage = v_disks_usage + usage_network_percent = v_usage_network_percent,disks_usage = v_disks_usage, _update_date = LOCALTIMESTAMP WHERE vm_guid = v_vm_guid; END; $procedure$ LANGUAGE plpgsql; -- To view, visit http://gerrit.ovirt.org/12919 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8f39b5cdc3771f438f9c61897cb0242e8bb6c90 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emes...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
