Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 1 | ---------------------- |
| 2 | HAProxy how-to |
| 3 | ---------------------- |
Willy Tarreau | 6b07bf7 | 2013-12-17 00:45:49 +0100 | [diff] [blame] | 4 | version 1.5-dev21 |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 5 | willy tarreau |
Willy Tarreau | 6b07bf7 | 2013-12-17 00:45:49 +0100 | [diff] [blame] | 6 | 2013/12/17 |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 7 | |
| 8 | |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 9 | 1) How to build it |
| 10 | ------------------ |
| 11 | |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 12 | To build haproxy, you will need : |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 13 | - GNU make. Neither Solaris nor OpenBSD's make work with the GNU Makefile. |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 14 | However, specific Makefiles for BSD and OSX are provided. |
Willy Tarreau | 32e65ef | 2013-04-02 08:14:29 +0200 | [diff] [blame] | 15 | - GCC between 2.91 and 4.7. Others may work, but not tested. |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 16 | - GNU ld |
| 17 | |
| 18 | Also, you might want to build with libpcre support, which will provide a very |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 19 | efficient regex implementation and will also fix some badness on Solaris' one. |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 20 | |
| 21 | To build haproxy, you have to choose your target OS amongst the following ones |
| 22 | and assign it to the TARGET variable : |
| 23 | |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 24 | - linux22 for Linux 2.2 |
| 25 | - linux24 for Linux 2.4 and above (default) |
| 26 | - linux24e for Linux 2.4 with support for a working epoll (> 0.21) |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 27 | - linux26 for Linux 2.6 and above |
Willy Tarreau | e0c623d | 2012-06-04 00:42:09 +0200 | [diff] [blame] | 28 | - linux2628 for Linux 2.6.28 and above (enables splice and tproxy) |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 29 | - solaris for Solaris 8 or 10 (others untested) |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 30 | - freebsd for FreeBSD 5 to 8.0 (others untested) |
Willy Tarreau | 8624cab | 2013-04-02 08:17:43 +0200 | [diff] [blame] | 31 | - osx for Mac OS/X |
Willy Tarreau | 3b8e979 | 2012-11-22 00:43:09 +0100 | [diff] [blame] | 32 | - openbsd for OpenBSD 3.1 to 5.2 (others untested) |
Willy Tarreau | 7dec965 | 2012-06-06 16:15:03 +0200 | [diff] [blame] | 33 | - aix52 for AIX 5.2 |
Yitzhak Sapir | 3208731 | 2009-06-14 18:27:54 +0200 | [diff] [blame] | 34 | - cygwin for Cygwin |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 35 | - generic for any other OS. |
| 36 | - custom to manually adjust every setting |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 37 | |
| 38 | You may also choose your CPU to benefit from some optimizations. This is |
| 39 | particularly important on UltraSparc machines. For this, you can assign |
| 40 | one of the following choices to the CPU variable : |
| 41 | |
| 42 | - i686 for intel PentiumPro, Pentium 2 and above, AMD Athlon |
| 43 | - i586 for intel Pentium, AMD K6, VIA C3. |
| 44 | - ultrasparc : Sun UltraSparc I/II/III/IV processor |
Willy Tarreau | a5899aa | 2010-11-28 07:41:00 +0100 | [diff] [blame] | 45 | - native : use the build machine's specific processor optimizations |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 46 | - generic : any other processor or no specific optimization. (default) |
| 47 | |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 48 | Alternatively, you may just set the CPU_CFLAGS value to the optimal GCC options |
| 49 | for your platform. |
| 50 | |
Willy Tarreau | ef7341d | 2009-04-11 19:45:50 +0200 | [diff] [blame] | 51 | You may want to build specific target binaries which do not match your native |
| 52 | compiler's target. This is particularly true on 64-bit systems when you want |
| 53 | to build a 32-bit binary. Use the ARCH variable for this purpose. Right now |
Willy Tarreau | a5899aa | 2010-11-28 07:41:00 +0100 | [diff] [blame] | 54 | it only knows about a few x86 variants (i386,i486,i586,i686,x86_64), two |
| 55 | generic ones (32,64) and sets -m32/-m64 as well as -march=<arch> accordingly. |
Willy Tarreau | ef7341d | 2009-04-11 19:45:50 +0200 | [diff] [blame] | 56 | |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 57 | If your system supports PCRE (Perl Compatible Regular Expressions), then you |
| 58 | really should build with libpcre which is between 2 and 10 times faster than |
| 59 | other libc implementations. Regex are used for header processing (deletion, |
| 60 | rewriting, allow, deny). The only inconvenient of libpcre is that it is not |
| 61 | yet widely spread, so if you build for other systems, you might get into |
| 62 | trouble if they don't have the dynamic library. In this situation, you should |
| 63 | statically link libpcre into haproxy so that it will not be necessary to |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 64 | install it on target systems. Available build options for PCRE are : |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 65 | |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 66 | - USE_PCRE=1 to use libpcre, in whatever form is available on your system |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 67 | (shared or static) |
| 68 | |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 69 | - USE_STATIC_PCRE=1 to use a static version of libpcre even if the dynamic |
| 70 | one is available. This will enhance portability. |
| 71 | |
Willy Tarreau | 663148c | 2012-12-12 00:38:22 +0100 | [diff] [blame] | 72 | - with no option, use your OS libc's standard regex implementation (default). |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 73 | Warning! group references on Solaris seem broken. Use static-pcre whenever |
| 74 | possible. |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 75 | |
Willy Tarreau | 64bc40b | 2011-03-23 20:00:53 +0100 | [diff] [blame] | 76 | Recent systems can resolve IPv6 host names using getaddrinfo(). This primitive |
| 77 | is not present in all libcs and does not work in all of them either. Support in |
| 78 | glibc was broken before 2.3. Some embedded libs may not properly work either, |
| 79 | thus, support is disabled by default, meaning that some host names which only |
| 80 | resolve as IPv6 addresses will not resolve and configs might emit an error |
| 81 | during parsing. If you know that your OS libc has reliable support for |
| 82 | getaddrinfo(), you can add USE_GETADDRINFO=1 on the make command line to enable |
| 83 | it. This is the recommended option for most Linux distro packagers since it's |
| 84 | working fine on all recent mainstream distros. It is automatically enabled on |
| 85 | Solaris 8 and above, as it's known to work. |
| 86 | |
Willy Tarreau | d450881 | 2012-09-10 09:07:41 +0200 | [diff] [blame] | 87 | It is possible to add native support for SSL using the GNU makefile only, and |
| 88 | by passing "USE_OPENSSL=1" on the make commande line. The libssl and libcrypto |
| 89 | will automatically be linked with haproxy. Some systems also require libz, so |
| 90 | if the build fails due to missing symbols such as deflateInit(), then try again |
| 91 | with "ADDLIB=-lz". |
| 92 | |
Lukas Tribus | 3fe9f1e | 2013-05-19 16:28:17 +0200 | [diff] [blame] | 93 | To link OpenSSL statically against haproxy, build OpenSSL with the no-shared |
| 94 | keyword and install it to a local directory, so your system is not affected : |
| 95 | |
| 96 | $ export STATICLIBSSL=/tmp/staticlibssl |
| 97 | $ ./config --prefix=$STATICLIBSSL no-shared |
| 98 | $ make && make install_sw |
| 99 | |
Lukas Tribus | 130ddf7 | 2013-10-01 00:28:03 +0200 | [diff] [blame] | 100 | When building haproxy, pass that path via SSL_INC and SSL_LIB to make and |
| 101 | include additional libs with ADDLIB if needed (in this case for example libdl): |
| 102 | $ make TARGET=linux26 USE_OPENSSL=1 SSL_INC=$STATICLIBSSL/include SSL_LIB=$STATICLIBSSL/lib ADDLIB=-ldl |
Lukas Tribus | 3fe9f1e | 2013-05-19 16:28:17 +0200 | [diff] [blame] | 103 | |
William Lallemand | 82fe75c | 2012-10-23 10:25:10 +0200 | [diff] [blame] | 104 | It is also possible to include native support for ZLIB to benefit from HTTP |
| 105 | compression. For this, pass "USE_ZLIB=1" on the "make" command line and ensure |
| 106 | that zlib is present on the system. |
| 107 | |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 108 | By default, the DEBUG variable is set to '-g' to enable debug symbols. It is |
| 109 | not wise to disable it on uncommon systems, because it's often the only way to |
| 110 | get a complete core when you need one. Otherwise, you can set DEBUG to '-s' to |
| 111 | strip the binary. |
| 112 | |
| 113 | For example, I use this to build for Solaris 8 : |
| 114 | |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 115 | $ make TARGET=solaris CPU=ultrasparc USE_STATIC_PCRE=1 |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 116 | |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 117 | And I build it this way on OpenBSD or FreeBSD : |
willy tarreau | d38e72d | 2006-03-19 20:56:52 +0100 | [diff] [blame] | 118 | |
| 119 | $ make -f Makefile.bsd REGEX=pcre DEBUG= COPTS.generic="-Os -fomit-frame-pointer -mgnu" |
| 120 | |
Willy Tarreau | 663148c | 2012-12-12 00:38:22 +0100 | [diff] [blame] | 121 | And on a classic Linux with SSL and ZLIB support (eg: Red Hat 5.x) : |
| 122 | |
| 123 | $ make TARGET=linux26 CPU=native USE_PCRE=1 USE_OPENSSL=1 USE_ZLIB=1 |
| 124 | |
| 125 | And on a recent Linux >= 2.6.28 with SSL and ZLIB support : |
Willy Tarreau | d450881 | 2012-09-10 09:07:41 +0200 | [diff] [blame] | 126 | |
William Lallemand | 82fe75c | 2012-10-23 10:25:10 +0200 | [diff] [blame] | 127 | $ make TARGET=linux2628 CPU=native USE_PCRE=1 USE_OPENSSL=1 USE_ZLIB=1 |
Willy Tarreau | d450881 | 2012-09-10 09:07:41 +0200 | [diff] [blame] | 128 | |
William Lallemand | 82fe75c | 2012-10-23 10:25:10 +0200 | [diff] [blame] | 129 | In order to build a 32-bit binary on an x86_64 Linux system with SSL support |
| 130 | without support for compression but when OpenSSL requires ZLIB anyway : |
Willy Tarreau | ef7341d | 2009-04-11 19:45:50 +0200 | [diff] [blame] | 131 | |
Willy Tarreau | d450881 | 2012-09-10 09:07:41 +0200 | [diff] [blame] | 132 | $ make TARGET=linux26 ARCH=i386 USE_OPENSSL=1 ADDLIB=-lz |
Willy Tarreau | ef7341d | 2009-04-11 19:45:50 +0200 | [diff] [blame] | 133 | |
Willy Tarreau | 3b8e979 | 2012-11-22 00:43:09 +0100 | [diff] [blame] | 134 | The BSD and OSX makefiles do not support build options for OpenSSL nor zlib. |
| 135 | Also, at least on OpenBSD, pthread_mutexattr_setpshared() does not exist so |
| 136 | the SSL session cache cannot be shared between multiple processes. If you want |
| 137 | to enable these options, you need to use GNU make with the default makefile as |
| 138 | follows : |
| 139 | |
| 140 | $ gmake TARGET=openbsd USE_OPENSSL=1 USE_ZLIB=1 USE_PRIVATE_CACHE=1 |
| 141 | |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 142 | If you need to pass other defines, includes, libraries, etc... then please |
| 143 | check the Makefile to see which ones will be available in your case, and |
Willy Tarreau | 83b30c1 | 2008-05-25 10:32:50 +0200 | [diff] [blame] | 144 | use the USE_* variables in the GNU Makefile, or ADDINC, ADDLIB, and DEFINE |
| 145 | variables in the BSD makefiles. |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 146 | |
Willy Tarreau | 97ec969 | 2010-01-28 20:52:05 +0100 | [diff] [blame] | 147 | AIX 5.3 is known to work with the generic target. However, for the binary to |
| 148 | also run on 5.2 or earlier, you need to build with DEFINE="-D_MSGQSUPPORT", |
| 149 | otherwise __fd_select() will be used while not being present in the libc. |
Willy Tarreau | 7dec965 | 2012-06-06 16:15:03 +0200 | [diff] [blame] | 150 | If you get build errors because of strange symbols or section mismatches, |
| 151 | simply remove -g from DEBUG_CFLAGS. |
Willy Tarreau | 97ec969 | 2010-01-28 20:52:05 +0100 | [diff] [blame] | 152 | |
Willy Tarreau | 32e65ef | 2013-04-02 08:14:29 +0200 | [diff] [blame] | 153 | You can easily define your own target with the GNU Makefile. Unknown targets |
| 154 | are processed with no default option except USE_POLL=default. So you can very |
| 155 | well use that property to define your own set of options. USE_POLL can even be |
| 156 | disabled by setting USE_POLL="". For example : |
| 157 | |
| 158 | $ gmake TARGET=tiny USE_POLL="" TARGET_CFLAGS=-fomit-frame-pointer |
| 159 | |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 160 | |
| 161 | 2) How to install it |
| 162 | -------------------- |
| 163 | |
| 164 | To install haproxy, you can either copy the single resulting binary to the |
| 165 | place you want, or run : |
| 166 | |
| 167 | $ sudo make install |
| 168 | |
| 169 | If you're packaging it for another system, you can specify its root directory |
| 170 | in the usual DESTDIR variable. |
| 171 | |
| 172 | |
| 173 | 3) How to set it up |
| 174 | ------------------- |
| 175 | |
| 176 | There is some documentation in the doc/ directory : |
| 177 | |
| 178 | - architecture.txt : this is the architecture manual. It is quite old and |
| 179 | does not tell about the nice new features, but it's still a good starting |
| 180 | point when you know what you want but don't know how to do it. |
| 181 | |
| 182 | - configuration.txt : this is the configuration manual. It recalls a few |
| 183 | essential HTTP basic concepts, and details all the configuration file |
| 184 | syntax (keywords, units). It also describes the log and stats format. It |
| 185 | is normally always up to date. If you see that something is missing from |
| 186 | it, please report it as this is a bug. |
| 187 | |
| 188 | - haproxy-en.txt / haproxy-fr.txt : these are the old outdated docs. You |
| 189 | should never need them. If you do, then please report what you didn't |
| 190 | find in the other ones. |
| 191 | |
| 192 | - gpl.txt / lgpl.txt : the copy of the licenses covering the software. See |
| 193 | the 'LICENSE' file at the top for more information. |
| 194 | |
| 195 | - the rest is mainly for developers. |
| 196 | |
| 197 | There are also a number of nice configuration examples in the "examples" |
| 198 | directory as well as on several sites and articles on the net which are linked |
| 199 | to from the haproxy web site. |
| 200 | |
| 201 | |
| 202 | 4) How to report a bug |
| 203 | ---------------------- |
| 204 | |
| 205 | It is possible that from time to time you'll find a bug. A bug is a case where |
| 206 | what you see is not what is documented. Otherwise it can be a misdesign. If you |
| 207 | find that something is stupidly design, please discuss it on the list (see the |
| 208 | "how to contribute" section below). If you feel like you're proceeding right |
| 209 | and haproxy doesn't obey, then first ask yourself if it is possible that nobody |
| 210 | before you has even encountered this issue. If it's unlikely, the you probably |
| 211 | have an issue in your setup. Just in case of doubt, please consult the mailing |
| 212 | list archives : |
| 213 | |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 214 | http://marc.info/?l=haproxy |
| 215 | |
| 216 | Otherwise, please try to gather the maximum amount of information to help |
| 217 | reproduce the issue and send that to the mailing list : |
| 218 | |
| 219 | haproxy@formilux.org |
| 220 | |
| 221 | Please include your configuration and logs. You can mask your IP addresses and |
| 222 | passwords, we don't need them. But it's essential that you post your config if |
| 223 | you want people to guess what is happening. |
| 224 | |
| 225 | Also, keep in mind that haproxy is designed to NEVER CRASH. If you see it die |
| 226 | without any reason, then it definitely is a critical bug that must be reported |
| 227 | and urgently fixed. It has happened a couple of times in the past, essentially |
| 228 | on development versions running on new architectures. If you think your setup |
| 229 | is fairly common, then it is possible that the issue is totally unrelated. |
| 230 | Anyway, if that happens, feel free to contact me directly, as I will give you |
| 231 | instructions on how to collect a usable core file, and will probably ask for |
| 232 | other captures that you'll not want to share with the list. |
| 233 | |
| 234 | |
| 235 | 5) How to contribute |
| 236 | -------------------- |
| 237 | |
| 238 | It is possible that you'll want to add a specific feature to satisfy your needs |
| 239 | or one of your customers'. Contributions are welcome, however I'm often very |
| 240 | picky about changes. I will generally reject patches that change massive parts |
| 241 | of the code, or that touch the core parts without any good reason if those |
| 242 | changes have not been discussed first. |
| 243 | |
| 244 | The proper place to discuss your changes is the HAProxy Mailing List. There are |
| 245 | enough skilled readers to catch hazardous mistakes and to suggest improvements. |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 246 | I trust a number of them enough to merge a patch if they say it's OK, so using |
| 247 | the list is the fastest way to get your code reviewed and merged. You can |
| 248 | subscribe to it by sending an empty e-mail at the following address : |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 249 | |
| 250 | haproxy+subscribe@formilux.org |
| 251 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 252 | If you have an idea about something to implement, *please* discuss it on the |
| 253 | list first. It has already happened several times that two persons did the same |
| 254 | thing simultaneously. This is a waste of time for both of them. It's also very |
| 255 | common to see some changes rejected because they're done in a way that will |
| 256 | conflict with future evolutions, or that does not leave a good feeling. It's |
| 257 | always unpleasant for the person who did the work, and it is unpleasant for me |
| 258 | too because I value people's time and efforts. That would not happen if these |
| 259 | were discussed first. There is no problem posting work in progress to the list, |
| 260 | it happens quite often in fact. Also, don't waste your time with the doc when |
| 261 | submitting patches for review, only add the doc with the patch you consider |
| 262 | ready to merge. |
| 263 | |
Willy Tarreau | 2ddccb7 | 2013-05-01 10:07:21 +0200 | [diff] [blame] | 264 | Another important point concerns code portability. Haproxy requires gcc as the |
| 265 | C compiler, and may or may not work with other compilers. However it's known |
| 266 | to build using gcc 2.95 or any later version. As such, it is important to keep |
| 267 | in mind that certain facilities offered by recent versions must not be used in |
| 268 | the code : |
| 269 | |
| 270 | - declarations mixed in the code (requires gcc >= 3.x) |
| 271 | - GCC builtins without checking for their availability based on version and |
| 272 | architecture ; |
| 273 | - assembly code without any alternate portable form for other platforms |
| 274 | - use of stdbool.h, "bool", "false", "true" : simply use "int", "0", "1" |
| 275 | - in general, anything which requires C99 (such as declaring variables in |
| 276 | "for" statements) |
| 277 | |
| 278 | Since most of these restrictions are just a matter of coding style, it is |
| 279 | normally not a problem to comply. |
| 280 | |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 281 | If your work is very confidential and you can't publicly discuss it, you can |
| 282 | also mail me directly about it, but your mail may be waiting several days in |
| 283 | the queue before you get a response. |
| 284 | |
| 285 | If you'd like a feature to be added but you think you don't have the skills to |
| 286 | implement it yourself, you should follow these steps : |
| 287 | |
| 288 | 1. discuss the feature on the mailing list. It is possible that someone |
| 289 | else has already implemented it, or that someone will tell you how to |
| 290 | proceed without it, or even why not to do it. It is also possible that |
| 291 | in fact it's quite easy to implement and people will guide you through |
| 292 | the process. That way you'll finally have YOUR patch merged, providing |
| 293 | the feature YOU need. |
| 294 | |
| 295 | 2. if you really can't code it yourself after discussing it, then you may |
| 296 | consider contacting someone to do the job for you. Some people on the |
| 297 | list might be OK with trying to do it. Otherwise, you can check the list |
| 298 | of contributors at the URL below, some of the regular contributors may |
| 299 | be able to do the work, probably not for free but their time is as much |
| 300 | valuable as yours after all, you can't eat the cake and have it too. |
| 301 | |
| 302 | The list of past and regular contributors is available below. It lists not only |
| 303 | significant code contributions (features, fixes), but also time or money |
| 304 | donations : |
| 305 | |
| 306 | http://haproxy.1wt.eu/contrib.html |
| 307 | |
| 308 | Note to contributors: it's very handy when patches comes with a properly |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 309 | formated subject. There are 3 criteria of particular importance in any patch : |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 310 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 311 | - its nature (is it a fix for a bug, a new feature, an optimization, ...) |
| 312 | - its importance, which generally reflects the risk of merging/not merging it |
| 313 | - what area it applies to (eg: http, stats, startup, config, doc, ...) |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 314 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 315 | It's important to make these 3 criteria easy to spot in the patch's subject, |
| 316 | because it's the first (and sometimes the only) thing which is read when |
| 317 | reviewing patches to find which ones need to be backported to older versions. |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 318 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 319 | Specifically, bugs must be clearly easy to spot so that they're never missed. |
| 320 | Any patch fixing a bug must have the "BUG" tag in its subject. Most common |
| 321 | patch types include : |
| 322 | |
| 323 | - BUG fix for a bug. The severity of the bug should also be indicated |
| 324 | when known. Similarly, if a backport is needed to older versions, |
| 325 | it should be indicated on the last line of the commit message. If |
| 326 | the bug has been identified as a regression brought by a specific |
| 327 | patch or version, this indication will be appreciated too. New |
| 328 | maintenance releases are generally emitted when a few of these |
| 329 | patches are merged. |
| 330 | |
| 331 | - CLEANUP code cleanup, silence of warnings, etc... theorically no impact. |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 332 | These patches will rarely be seen in stable branches, though they |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 333 | may appear when they remove some annoyance or when they make |
| 334 | backporting easier. By nature, a cleanup is always minor. |
| 335 | |
| 336 | - REORG code reorganization. Some blocks may be moved to other places, |
| 337 | some important checks might be swapped, etc... These changes |
| 338 | always present a risk of regression. For this reason, they should |
| 339 | never be mixed with any bug fix nor functional change. Code is |
| 340 | only moved as-is. Indicating the risk of breakage is highly |
| 341 | recommended. |
| 342 | |
| 343 | - BUILD updates or fixes for build issues. Changes to makefiles also fall |
| 344 | into this category. The risk of breakage should be indicated if |
| 345 | known. It is also appreciated to indicate what platforms and/or |
| 346 | configurations were tested after the change. |
| 347 | |
| 348 | - OPTIM some code was optimised. Sometimes if the regression risk is very |
| 349 | low and the gains significant, such patches may be merged in the |
| 350 | stable branch. Depending on the amount of code changed or replaced |
| 351 | and the level of trust the author has in the change, the risk of |
| 352 | regression should be indicated. |
| 353 | |
| 354 | - RELEASE release of a new version (development or stable). |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 355 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 356 | - LICENSE licensing updates (may impact distro packagers). |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 357 | |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 358 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 359 | When the patch cannot be categorized, it's best not to put any tag. This is |
| 360 | commonly the case for new features, which development versions are mostly made |
| 361 | of. |
| 362 | |
| 363 | Additionally, the importance of the patch should be indicated when known. A |
| 364 | single upper-case word is preferred, among : |
| 365 | |
| 366 | - MINOR minor change, very low risk of impact. It is often the case for |
| 367 | code additions that don't touch live code. For a bug, it generally |
| 368 | indicates an annoyance, nothing more. |
| 369 | |
| 370 | - MEDIUM medium risk, may cause unexpected regressions of low importance or |
| 371 | which may quickly be discovered. For a bug, it generally indicates |
| 372 | something odd which requires changing the configuration in an |
| 373 | undesired way to work around the issue. |
| 374 | |
| 375 | - MAJOR major risk of hidden regression. This happens when I rearrange |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 376 | large parts of code, when I play with timeouts, with variable |
| 377 | initializations, etc... We should only exceptionally find such |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 378 | patches in stable branches. For a bug, it indicates severe |
| 379 | reliability issues for which workarounds are identified with or |
| 380 | without performance impacts. |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 381 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 382 | - CRITICAL medium-term reliability or security is at risk and workarounds, |
| 383 | if they exist, might not always be acceptable. An upgrade is |
| 384 | absolutely required. A maintenance release may be emitted even if |
| 385 | only one of these bugs are fixed. Note that this tag is only used |
| 386 | with bugs. Such patches must indicate what is the first version |
| 387 | affected, and if known, the commit ID which introduced the issue. |
| 388 | |
| 389 | If this criterion doesn't apply, it's best not to put it. For instance, most |
| 390 | doc updates and most examples or test files are just added or updated without |
| 391 | any need to qualify a level of importance. |
| 392 | |
| 393 | The area the patch applies to is quite important, because some areas are known |
| 394 | to be similar in older versions, suggesting a backport might be desirable, and |
| 395 | conversely, some areas are known to be specific to one version. When the tag is |
| 396 | used alone, uppercase is preferred for readability, otherwise lowercase is fine |
| 397 | too. The following tags are suggested but not limitative : |
| 398 | |
| 399 | - doc documentation updates or fixes. No code is affected, no need to |
| 400 | upgrade. These patches can also be sent right after a new feature, |
| 401 | to document it. |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 402 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 403 | - examples example files. Be careful, sometimes these files are packaged. |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 404 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 405 | - tests regression test files. No code is affected, no need to upgrade. |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 406 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 407 | - init initialization code, arguments parsing, etc... |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 408 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 409 | - config configuration parser, mostly used when adding new config keywords |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 410 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 411 | - http the HTTP engine |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 412 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 413 | - stats the stats reporting engine as well as the stats socket CLI |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 414 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 415 | - checks the health checks engine (eg: when adding new checks) |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 416 | |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 417 | - acl the ACL processing core or some ACLs from other areas |
| 418 | |
| 419 | - peers the peer synchronization engine |
| 420 | |
| 421 | - listeners everything related to incoming connection settings |
| 422 | |
| 423 | - frontend everything related to incoming connection processing |
| 424 | |
| 425 | - backend everything related to LB algorithms and server farm |
| 426 | |
| 427 | - session session processing and flags (very sensible, be careful) |
| 428 | |
| 429 | - server server connection management, queueing |
| 430 | |
| 431 | - proxy proxy maintenance (start/stop) |
| 432 | |
| 433 | - log log management |
| 434 | |
| 435 | - poll any of the pollers |
| 436 | |
| 437 | - halog the halog sub-component in the contrib directory |
| 438 | |
| 439 | - contrib any addition to the contrib directory |
| 440 | |
| 441 | Other names may be invented when more precise indications are meaningful, for |
| 442 | instance : "cookie" which indicates cookie processing in the HTTP core. Last, |
| 443 | indicating the name of the affected file is also a good way to quickly spot |
| 444 | changes. Many commits were already tagged with "stream_sock" or "cfgparse" for |
| 445 | instance. |
| 446 | |
| 447 | It is desired that AT LEAST one of the 3 criteria tags is reported in the patch |
| 448 | subject. Ideally, we would have the 3 most often. The two first criteria should |
| 449 | be present before a first colon (':'). If both are present, then they should be |
| 450 | delimited with a slash ('/'). The 3rd criterion (area) should appear next, also |
| 451 | followed by a colon. Thus, all of the following messages are valid : |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 452 | |
| 453 | Examples of messages : |
Willy Tarreau | 9a639a1 | 2011-09-10 22:48:36 +0200 | [diff] [blame] | 454 | - DOC: document options forwardfor to logasap |
| 455 | - DOC/MAJOR: reorganize the whole document and change indenting |
| 456 | - BUG: stats: connection reset counters must be plain ascii, not HTML |
| 457 | - BUG/MINOR: stats: connection reset counters must be plain ascii, not HTML |
| 458 | - MEDIUM: checks: support multi-packet health check responses |
| 459 | - RELEASE: Released version 1.4.2 |
| 460 | - BUILD: stats: stdint is not present on solaris |
| 461 | - OPTIM/MINOR: halog: make fgets parse more bytes by blocks |
| 462 | - REORG/MEDIUM: move syscall redefinition to specific places |
| 463 | |
| 464 | Please do not use square brackets anymore around the tags, because they give me |
| 465 | more work when merging patches. By default I'm asking Git to keep them but this |
| 466 | causes trouble when patches are prefixed with the [PATCH] tag because in order |
| 467 | not to store it, I have to hand-edit the patches. So as of now, I will ask Git |
| 468 | to remove whatever is located between square brackets, which implies that any |
| 469 | subject formatted the old way will have its tag stripped out. |
| 470 | |
| 471 | In fact, one of the only square bracket tags that still makes sense is '[RFC]' |
| 472 | at the beginning of the subject, when you're asking for someone to review your |
| 473 | change before getting it merged. If the patch is OK to be merged, then I can |
| 474 | merge it as-is and the '[RFC]' tag will automatically be removed. If you don't |
| 475 | want it to be merged at all, you can simply state it in the message, or use an |
| 476 | alternate '[WIP]' tag ("work in progress"). |
| 477 | |
| 478 | The tags are not rigid, follow your intuition first, anyway I reserve the right |
| 479 | to change them when merging the patch. It may happen that a same patch has a |
| 480 | different tag in two distinct branches. The reason is that a bug in one branch |
| 481 | may just be a cleanup in the other one because the code cannot be triggered. |
| 482 | |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 483 | |
| 484 | For a more efficient interaction between the mainline code and your code, I can |
| 485 | only strongly encourage you to try the Git version control system : |
| 486 | |
| 487 | http://git-scm.com/ |
| 488 | |
| 489 | It's very fast, lightweight and lets you undo/redo your work as often as you |
| 490 | want, without making your mistakes visible to the rest of the world. It will |
| 491 | definitely help you contribute quality code and take other people's feedback |
| 492 | in consideration. In order to clone the HAProxy Git repository : |
| 493 | |
| 494 | $ git clone http://git.1wt.eu/git/haproxy-1.4.git (stable 1.4) |
| 495 | $ git clone http://git.1wt.eu/git/haproxy.git/ (development) |
| 496 | |
Willy Tarreau | 663148c | 2012-12-12 00:38:22 +0100 | [diff] [blame] | 497 | The site above is slow, a faster mirror is maintained up to date here : |
| 498 | |
| 499 | $ git clone http://master.formilux.org/git/people/willy/haproxy.git/ |
| 500 | |
Willy Tarreau | b1a34b6 | 2010-05-09 22:37:12 +0200 | [diff] [blame] | 501 | If you decide to use Git for your developments, then your commit messages will |
| 502 | have the subject line in the format described above, then the whole description |
| 503 | of your work (mainly why you did it) will be in the body. You can directly send |
| 504 | your commits to the mailing list, the format is convenient to read and process. |
| 505 | |
willy tarreau | 7834533 | 2005-12-18 01:33:16 +0100 | [diff] [blame] | 506 | -- end |