r49395 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r49394‎ | r49395 | r49396 >
Date:10:53, 11 April 2009
Author:midom
Status:deferred
Tags:
Comment:
* Remove memory locking, I'm not sure it is good idea, should track swapiness instead
* Fix http://code.google.com/p/memcached/issues/detail?id=44 (apt-get install kills memcached right after starting it :)
Modified paths:
  • /trunk/debs/memcached/debian/changelog (modified) (history)
  • /trunk/debs/memcached/debian/memcached.conf (modified) (history)
  • /trunk/debs/memcached/debian/patches/00list (modified) (history)
  • /trunk/debs/memcached/debian/patches/sighup-daemon.dpatch (added) (history)

Diff [purge]

Index: trunk/debs/memcached/debian/changelog
@@ -1,6 +1,7 @@
22 memcached (1.2.8-2) wikimedia; urgency=high
33 * add ipc_lock capability to apparmor profile
44
 5+ -- Domas Mituzas <domas.mituzas@gmail.com> Sat, 11 Apr 2008 13:15:00 +0300
56 memcached (1.2.8-1) wikimedia; urgency=high
67
78 * New upstream release
Index: trunk/debs/memcached/debian/patches/sighup-daemon.dpatch
@@ -0,0 +1,18 @@
 2+#! /bin/sh /usr/share/dpatch/dpatch-run
 3+## sighup-daemon.dpatch by <midom@ragweed.knams.wikimedia.org>
 4+##
 5+## All lines beginning with `## DP:' are a description of the patch.
 6+## DP: No description.
 7+
 8+@DPATCH@
 9+diff -urNad memcached-1.2.8~/memcached.c memcached-1.2.8/memcached.c
 10+--- memcached-1.2.8~/memcached.c 2009-04-11 06:12:29.000000000 +0000
 11+@@ -2979,6 +2979,7 @@
 12+ fprintf(stderr, "failed to daemon() in order to daemonize\n");
 13+ return 1;
 14+ }
 15++ signal(SIGHUP,SIG_IGN);
 16+ }
 17+
 18+ /* lock paged memory if needed */
Property changes on: trunk/debs/memcached/debian/patches/sighup-daemon.dpatch
___________________________________________________________________
Name: svn:executable
119 + *
Index: trunk/debs/memcached/debian/patches/00list
@@ -1,2 +1,3 @@
22 cas-shrink.dpatch
33 no-chunk-align.dpatch
 4+sighup-daemon.dpatch
Index: trunk/debs/memcached/debian/memcached.conf
@@ -38,7 +38,7 @@
3939 -c 20000
4040
4141 # Lock down all paged memory. Consult with the README and homepage before you do this
42 --k
 42+# -k
4343
4444 # Return error when memory is exhausted (rather than removing items)
4545 # -M

Status & tagging log