25c163a7c73c6c9186ff840b2f214ab0de93bdb3 galt Thu Jun 12 18:07:36 2025 -0700 Revert "fix for overflowing packet issue when paraHub restarts but most jobs are run on just one node." Hiram reports it did not fix the problem. This reverts commit f727e7c1325f863157c57d88ba0a1c3cf65b1478. diff --git src/parasol/lib/paraMessage.c src/parasol/lib/paraMessage.c index 1b368efa90f..598fe202f47 100644 --- src/parasol/lib/paraMessage.c +++ src/parasol/lib/paraMessage.c @@ -51,51 +51,51 @@ freez(pPm); } void pmClear(struct paraMessage *pm) /* Clear out data buffer. */ { pm->size = 0; } void pmSet(struct paraMessage *pm, char *message) /* Set message in data buffer. */ { int len = strlen(message); if (len >= sizeof(pm->data) - 1) { - errAbort("Message too long in pmSet, ignoring: %.20s...", message); - //pmClear(pm); + warn("Message too long in pmSet, ignoring: %.20s...", message); + pmClear(pm); } else { strcpy(pm->data, message); pm->size = len; } } void pmVaPrintf(struct paraMessage *pm, char *format, va_list args) /* Print message into end of data buffer. Warn if it goes * past limit. */ { int sizeLeft = sizeof(pm->data) - pm->size; int sz = vsnprintf(pm->data + pm->size, sizeLeft, format, args); /* note that some version return -1 if too small */ if ((sz < 0) || (sz >= sizeLeft)) { - errAbort("pmVaPrintf buffer overflow size %d, format %s", sz, format); - //pmClear(pm); + warn("pmVaPrintf buffer overflow size %d, format %s", sz, format); + pmClear(pm); } else pm->size += sz; } void pmPrintf(struct paraMessage *pm, char *format, ...) /* Print message into end of data buffer. Warn if it goes * past limit. */ { va_list args; va_start(args, format); pmVaPrintf(pm, format, args); va_end(args); }