@cryptotaxi247 / kubo / commits / 30fb10a63

Update pinned defaults

Marco Munizaga committed Jul 26, 2022 at 05:03 UTC 30fb10a635be8956d82f0963d2acc6e45cbf0d76
1 file changed +173 -66
core/node/libp2p/rcmgr_defaults.go
+173 -66
@@ -151,103 +151,190 @@ func jsonDiff(old []byte, updated []byte) ([]string, error) {
151 // https://github.com/libp2p/go-libp2p-resource-manager/blob/v0.1.5/limit_defaults.go#L49
152 const expectedDefaultLimits = `{
153 "SystemBaseLimit": {
154 - "Streams": 16384,
155 - "StreamsInbound": 4096,
156 - "StreamsOutbound": 16384,
157 - "Conns": 1024,
158 - "ConnsInbound": 256,
159 - "ConnsOutbound": 1024,
160 - "FD": 512
154 + "Streams": 2048,
155 + "StreamsInbound": 1024,
156 + "StreamsOutbound": 2048,
157 + "Conns": 128,
158 + "ConnsInbound": 64,
159 + "ConnsOutbound": 128,
160 + "FD": 256,
161 + "Memory": 134217728
162 },
162 - "SystemMemory": {
163 - "MemoryFraction": 0.125,
164 - "MinMemory": 134217728,
165 - "MaxMemory": 1073741824
163 + "SystemLimitIncrease": {
164 + "Streams": 2048,
165 + "StreamsInbound": 1024,
166 + "StreamsOutbound": 2048,
167 + "Conns": 128,
168 + "ConnsInbound": 64,
169 + "ConnsOutbound": 128,
170 + "Memory": 1073741824,
171 + "FDFraction": 1
172 },
173 "TransientBaseLimit": {
168 - "Streams": 512,
174 + "Streams": 256,
175 "StreamsInbound": 128,
170 - "StreamsOutbound": 512,
171 - "Conns": 128,
176 + "StreamsOutbound": 256,
177 + "Conns": 64,
178 "ConnsInbound": 32,
179 + "ConnsOutbound": 64,
180 + "FD": 64,
181 + "Memory": 33554432
182 + },
183 + "TransientLimitIncrease": {
184 + "Streams": 256,
185 + "StreamsInbound": 128,
186 + "StreamsOutbound": 256,
187 + "Conns": 32,
188 + "ConnsInbound": 16,
189 + "ConnsOutbound": 32,
190 + "Memory": 134217728,
191 + "FDFraction": 0.25
192 + },
193 + "AllowlistedSystemBaseLimit": {
194 + "Streams": 2048,
195 + "StreamsInbound": 1024,
196 + "StreamsOutbound": 2048,
197 + "Conns": 128,
198 + "ConnsInbound": 64,
199 + "ConnsOutbound": 128,
200 + "FD": 256,
201 + "Memory": 134217728
202 + },
203 + "AllowlistedSystemLimitIncrease": {
204 + "Streams": 2048,
205 + "StreamsInbound": 1024,
206 + "StreamsOutbound": 2048,
207 + "Conns": 128,
208 + "ConnsInbound": 64,
209 "ConnsOutbound": 128,
174 - "FD": 128
210 + "Memory": 1073741824,
211 + "FDFraction": 1
212 + },
213 + "AllowlistedTransientBaseLimit": {
214 + "Streams": 256,
215 + "StreamsInbound": 128,
216 + "StreamsOutbound": 256,
217 + "Conns": 64,
218 + "ConnsInbound": 32,
219 + "ConnsOutbound": 64,
220 + "FD": 64,
221 + "Memory": 33554432
222 },
176 - "TransientMemory": {
177 - "MemoryFraction": 1,
178 - "MinMemory": 67108864,
179 - "MaxMemory": 67108864
223 + "AllowlistedTransientLimitIncrease": {
224 + "Streams": 256,
225 + "StreamsInbound": 128,
226 + "StreamsOutbound": 256,
227 + "Conns": 32,
228 + "ConnsInbound": 16,
229 + "ConnsOutbound": 32,
230 + "Memory": 134217728,
231 + "FDFraction": 0.25
232 },
233 "ServiceBaseLimit": {
182 - "Streams": 8192,
183 - "StreamsInbound": 2048,
184 - "StreamsOutbound": 8192,
234 + "Streams": 4096,
235 + "StreamsInbound": 1024,
236 + "StreamsOutbound": 4096,
237 "Conns": 0,
238 "ConnsInbound": 0,
239 "ConnsOutbound": 0,
188 - "FD": 0
240 + "FD": 0,
241 + "Memory": 67108864
242 },
190 - "ServiceMemory": {
191 - "MemoryFraction": 0.03125,
192 - "MinMemory": 67108864,
193 - "MaxMemory": 268435456
243 + "ServiceLimitIncrease": {
244 + "Streams": 2048,
245 + "StreamsInbound": 512,
246 + "StreamsOutbound": 2048,
247 + "Conns": 0,
248 + "ConnsInbound": 0,
249 + "ConnsOutbound": 0,
250 + "Memory": 134217728,
251 + "FDFraction": 0
252 },
253 + "ServiceLimits": null,
254 "ServicePeerBaseLimit": {
196 - "Streams": 512,
197 - "StreamsInbound": 256,
198 - "StreamsOutbound": 512,
255 + "Streams": 256,
256 + "StreamsInbound": 128,
257 + "StreamsOutbound": 256,
258 "Conns": 0,
259 "ConnsInbound": 0,
260 "ConnsOutbound": 0,
202 - "FD": 0
261 + "FD": 0,
262 + "Memory": 16777216
263 },
204 - "ServicePeerMemory": {
205 - "MemoryFraction": 0.0078125,
206 - "MinMemory": 16777216,
207 - "MaxMemory": 67108864
264 + "ServicePeerLimitIncrease": {
265 + "Streams": 8,
266 + "StreamsInbound": 4,
267 + "StreamsOutbound": 8,
268 + "Conns": 0,
269 + "ConnsInbound": 0,
270 + "ConnsOutbound": 0,
271 + "Memory": 4194304,
272 + "FDFraction": 0
273 },
274 + "ServicePeerLimits": null,
275 "ProtocolBaseLimit": {
210 - "Streams": 4096,
211 - "StreamsInbound": 1024,
212 - "StreamsOutbound": 4096,
276 + "Streams": 2048,
277 + "StreamsInbound": 512,
278 + "StreamsOutbound": 2048,
279 "Conns": 0,
280 "ConnsInbound": 0,
281 "ConnsOutbound": 0,
216 - "FD": 0
282 + "FD": 0,
283 + "Memory": 67108864
284 },
218 - "ProtocolMemory": {
219 - "MemoryFraction": 0.015625,
220 - "MinMemory": 67108864,
221 - "MaxMemory": 134217728
285 + "ProtocolLimitIncrease": {
286 + "Streams": 512,
287 + "StreamsInbound": 256,
288 + "StreamsOutbound": 512,
289 + "Conns": 0,
290 + "ConnsInbound": 0,
291 + "ConnsOutbound": 0,
292 + "Memory": 171966464,
293 + "FDFraction": 0
294 },
295 + "ProtocolLimits": null,
296 "ProtocolPeerBaseLimit": {
224 - "Streams": 512,
225 - "StreamsInbound": 128,
226 - "StreamsOutbound": 256,
297 + "Streams": 256,
298 + "StreamsInbound": 64,
299 + "StreamsOutbound": 128,
300 "Conns": 0,
301 "ConnsInbound": 0,
302 "ConnsOutbound": 0,
230 - "FD": 0
303 + "FD": 0,
304 + "Memory": 16777216
305 },
232 - "ProtocolPeerMemory": {
233 - "MemoryFraction": 0.0078125,
234 - "MinMemory": 16777216,
235 - "MaxMemory": 67108864
306 + "ProtocolPeerLimitIncrease": {
307 + "Streams": 16,
308 + "StreamsInbound": 4,
309 + "StreamsOutbound": 8,
310 + "Conns": 0,
311 + "ConnsInbound": 0,
312 + "ConnsOutbound": 0,
313 + "Memory": 4,
314 + "FDFraction": 0
315 },
316 + "ProtocolPeerLimits": null,
317 "PeerBaseLimit": {
238 - "Streams": 1024,
239 - "StreamsInbound": 512,
240 - "StreamsOutbound": 1024,
241 - "Conns": 16,
242 - "ConnsInbound": 8,
243 - "ConnsOutbound": 16,
244 - "FD": 8
318 + "Streams": 512,
319 + "StreamsInbound": 256,
320 + "StreamsOutbound": 512,
321 + "Conns": 8,
322 + "ConnsInbound": 4,
323 + "ConnsOutbound": 8,
324 + "FD": 4,
325 + "Memory": 67108864
326 },
246 - "PeerMemory": {
247 - "MemoryFraction": 0.0078125,
248 - "MinMemory": 67108864,
249 - "MaxMemory": 134217728
327 + "PeerLimitIncrease": {
328 + "Streams": 256,
329 + "StreamsInbound": 128,
330 + "StreamsOutbound": 256,
331 + "Conns": 0,
332 + "ConnsInbound": 0,
333 + "ConnsOutbound": 0,
334 + "Memory": 134217728,
335 + "FDFraction": 0.015625
336 },
337 + "PeerLimits": null,
338 "ConnBaseLimit": {
339 "Streams": 0,
340 "StreamsInbound": 0,
@@ -255,9 +342,19 @@ const expectedDefaultLimits = `{
342 "Conns": 1,
343 "ConnsInbound": 1,
344 "ConnsOutbound": 1,
258 - "FD": 1
345 + "FD": 1,
346 + "Memory": 1048576
347 + },
348 + "ConnLimitIncrease": {
349 + "Streams": 0,
350 + "StreamsInbound": 0,
351 + "StreamsOutbound": 0,
352 + "Conns": 0,
353 + "ConnsInbound": 0,
354 + "ConnsOutbound": 0,
355 + "Memory": 0,
356 + "FDFraction": 0
357 },
260 - "ConnMemory": 1048576,
358 "StreamBaseLimit": {
359 "Streams": 1,
360 "StreamsInbound": 1,
@@ -265,9 +362,19 @@ const expectedDefaultLimits = `{
362 "Conns": 0,
363 "ConnsInbound": 0,
364 "ConnsOutbound": 0,
268 - "FD": 0
365 + "FD": 0,
366 + "Memory": 16777216
367 },
270 - "StreamMemory": 16777216
368 + "StreamLimitIncrease": {
369 + "Streams": 0,
370 + "StreamsInbound": 0,
371 + "StreamsOutbound": 0,
372 + "Conns": 0,
373 + "ConnsInbound": 0,
374 + "ConnsOutbound": 0,
375 + "Memory": 0,
376 + "FDFraction": 0
377 + }
378 }`
379
380 // https://github.com/libp2p/go-libp2p/blob/v0.18.0/limits.go#L17