Title: [opsview] [5335] Fix upgrade for ODW databases where performance_labels table is MyISAM, rather than InnoDB
- Revision
- 5335
- Author
- tvoon
- Date
- 2010-11-08 16:55:46 +0000 (Mon, 08 Nov 2010)
Log Message
Fix upgrade for ODW databases where performance_labels table is MyISAM, rather than InnoDB
Modified Paths
Added Paths
Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2010-11-08 16:38:02 UTC (rev 5334)
+++ trunk/CHANGES 2010-11-08 16:55:46 UTC (rev 5335)
@@ -1,13 +1,11 @@
This documents the major changes between releases
-3.11 ????
- FEATURES:
- ENHANCEMENTS:
- WARNINGS:
+3.9.1.??
FIXES:
Fixed slight visual glitch when long text is in Actions button
+ Fixed upgrade of ODW database when ODW is MyISAM type
-3.9.1 8th November 2010
+3.9.1.5328 8th November 2010
FEATURES:
UI updates to page headers (to increase amount of visible area - contributed by Capside) and menus
Performance data updates now run asynchronously, reducing gaps in graphs. You will need to manually create a service check
Modified: trunk/opsview-core/bin/db_odw
===================================================================
--- trunk/opsview-core/bin/db_odw 2010-11-08 16:38:02 UTC (rev 5334)
+++ trunk/opsview-core/bin/db_odw 2010-11-08 16:55:46 UTC (rev 5335)
@@ -427,8 +427,7 @@
first DOUBLE NOT NULL,
sum DOUBLE NOT NULL,
INDEX (start_datetime),
- INDEX (performance_label),
- CONSTRAINT performance_hourly_summary_performance_label_fk FOREIGN KEY (performance_label) REFERENCES performance_labels(id)
+ INDEX (performance_label)
) ENGINE=InnoDB;
CREATE TABLE dataloads (
Modified: trunk/opsview-core/installer/upgradedb_odw.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb_odw.pl 2010-11-08 16:38:02 UTC (rev 5334)
+++ trunk/opsview-core/installer/upgradedb_odw.pl 2010-11-08 16:55:46 UTC (rev 5335)
@@ -753,8 +753,7 @@
first DOUBLE NOT NULL,
sum DOUBLE NOT NULL,
INDEX (start_datetime),
- INDEX (performance_label),
- CONSTRAINT performance_hourly_summary_performance_label_fk FOREIGN KEY (performance_label) REFERENCES performance_labels(id)
+ INDEX (performance_label)
) ENGINE=InnoDB;
}
);
Added: trunk/opsview-core/utils/update_test_odw
===================================================================
--- trunk/opsview-core/utils/update_test_odw (rev 0)
+++ trunk/opsview-core/utils/update_test_odw 2010-11-08 16:55:46 UTC (rev 5335)
@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /usr/local/nagios
+
+echo "Upgrading ODW (myisam)"
+bin/db_odw -t db_restore < t/var/odw.db
+installer/upgradedb_odw.pl
+
+echo "Upgrading ODW (innodb)"
+bin/db_odw -t db_restore < t/var/odw.db
+installer/upgradedb_odw.pl
+bin/db_odw -t db_backup > t/var/odw.db
+
+echo "All happy"
Property changes on: trunk/opsview-core/utils/update_test_odw
___________________________________________________________________
Added: svn:executable
+ *
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
