[Opsview-checkins] [opsview] [10976] Switch to using Cache::BerkeleyDB instead of Cache:: FastMmap

Wed, 12 Dec 2012 13:29:34 -0800

Title: [opsview] [10976] Switch to using Cache::BerkeleyDB instead of Cache::FastMmap
Revision
10976
Author
tvoon
Date
2012-12-12 21:29:30 +0000 (Wed, 12 Dec 2012)

Log Message

Switch to using Cache::BerkeleyDB instead of Cache::FastMmap

Modified Paths



Property Changed





Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577
/branches/nagvis-iframe:9764-9786
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
   + /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932
/branches/nagvis-iframe:9764-9786
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2012-12-12 12:20:50 UTC (rev 10975)
+++ trunk/CHANGES	2012-12-12 21:29:30 UTC (rev 10976)
@@ -22,6 +22,7 @@
     Fixed rc.opsview-agent init script to pick up when nrpe is running on an incorrectly recorded pid
     Fixed installation on SLES11 where check_http_authentication would cause upgrades to hang
     Fixed SOAP::Lite perl module error
+    Change to using Cache::BerkelyDB instead of deprecated Cache::FastMmap
 
 3.20120925
     FEATURES:


Property changes on: trunk/opsview-core
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/DEV-capside/release-3.9.0/opsview-core:6365-6370
/branches/DEV-extra-notification-data/opsview-core:6734-6746
/branches/DEV-odw-calculations/opsview-core:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core:9778
/branches/DEV-snmp-multi/opsview-core:7324-7376
/branches/US187/opsview-core:9403-9479
/branches/US198b/opsview-core:8875-8994
/branches/US310/opsview-core:9851-9873
/branches/enterprise/BRAN-3.14/opsview-core:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577
/branches/nagvis-iframe/opsview-core:9764-9786
/branches/us168/opsview-core:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10966
/commercial/branches/BRAN-4.2/opsview-core:10944,10966
/commercial/branches/US306-slaves/opsview-core:9804-9823
/commercial/branches/US307-network-map/opsview-core:9685-9837
   + /branches/DEV-capside/release-3.9.0/opsview-core:6365-6370
/branches/DEV-extra-notification-data/opsview-core:6734-6746
/branches/DEV-odw-calculations/opsview-core:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core:9778
/branches/DEV-snmp-multi/opsview-core:7324-7376
/branches/US187/opsview-core:9403-9479
/branches/US198b/opsview-core:8875-8994
/branches/US310/opsview-core:9851-9873
/branches/enterprise/BRAN-3.14/opsview-core:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932
/branches/nagvis-iframe/opsview-core:9764-9786
/branches/us168/opsview-core:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10966
/commercial/branches/BRAN-4.2/opsview-core:10944,10966
/commercial/branches/US306-slaves/opsview-core:9804-9823
/commercial/branches/US307-network-map/opsview-core:9685-9837

Modified: trunk/opsview-web/lib/Opsview/Web.pm
===================================================================
--- trunk/opsview-web/lib/Opsview/Web.pm	2012-12-12 12:20:50 UTC (rev 10975)
+++ trunk/opsview-web/lib/Opsview/Web.pm	2012-12-12 21:29:30 UTC (rev 10976)
@@ -44,7 +44,7 @@
 #                 application's home directory
 # Static::Simple: will serve static files from the application's root
 #                 directory
-#        Session: session support (plus FastMmap storage and cookie state)
+#        Session: session support (plus DBI storage and cookie state)
 # Authentication: user login support + the CDBI/DBIC user store plugin
 
 use Log::Log4perl::Catalyst;
@@ -52,7 +52,7 @@
 use Catalyst qw/ConfigLoader Static::Simple
   Session Session::Store::DBI Session::State::Cookie
   Authentication
-  Cache::FastMmap
+  Cache::BerkeleyDB
   Snippets
   I18N
   Unicode
@@ -294,15 +294,8 @@
   ['/usr/local/nagios/share'];
 __PACKAGE__->config->{'Plugin::Static::Simple'}->{ignore_extensions} = [qw/tt/];
 
-# General FastMmap cache - used by C::P::Snippets in snmpwalk
-# Separate from session data (though also implemented as fastmmap)
-# We delete it on startup. Need to create path otherwise complains on startup
-# TODO: pass init_file instead? See Cache::FastMmap. Patch Catalyst::Plugin::Cache::FastMmap
-# to allow
-$_ = "/tmp/opsview/web/cache";
-unlink $_;
-Path::Class::Dir->new("/tmp/opsview/web/cache")->mkpath;
-__PACKAGE__->config->{cache}->{storage}  = $_;
+# General BerkleyDB cache - used by C::P::Snippets in snmpwalk
+__PACKAGE__->config->{cache}->{storage}  = "/opt/opsview/work/web-cache";
 __PACKAGE__->config->{cache}->{expires}  = 3600;
 __PACKAGE__->config->{'Plugin::Session'} = {
     expires           => 3600,

Modified: trunk/tools/hudson_trunk_build
===================================================================
--- trunk/tools/hudson_trunk_build	2012-12-12 12:20:50 UTC (rev 10975)
+++ trunk/tools/hudson_trunk_build	2012-12-12 21:29:30 UTC (rev 10976)
@@ -51,6 +51,12 @@
 rm -f /usr/local/opsview-web
 ln -s "$WORKSPACE/$projectdir/opsview-core" /usr/local/nagios
 ln -s "$WORKSPACE/$projectdir/opsview-web" /usr/local/opsview-web
+
+echo "Taking over ownership of web-cache"
+sudo rm -rf /opt/opsview/work/web-cache/* || true
+sudo mkdir -p /opt/opsview/work/web-cache/ || true
+sudo chown nagios.nagios /opt/opsview/work/web-cache/ || true
+
 rm -fr /usr/local/nagios/perl
 [[ -d /opt/opsview ]] || mkdir /opt/opsview
 rm -fr /opt/opsview/perl


_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins

Reply via email to