329 Commits

Author SHA1 Message Date
Rainer Gerhards
90f8c73004 bugfix: problems in failover action handling
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
2011-06-16 15:17:48 +02:00
Rainer Gerhards
49d7b4cd66 preparing for 5.9.0 2011-06-10 03:39:40 +02:00
Rainer Gerhards
209948aa4d set queue name to aciton name (useful for impstats!)
so far untested, test follows
2011-06-07 19:07:23 +02:00
Rainer Gerhards
3ad873e17a step: action queues now activated only AFTER privilege drop 2011-05-02 17:13:13 +02:00
Rainer Gerhards
6093f31103 step: moved main message queue activation to after priv drop 2011-04-27 17:57:47 +02:00
Rainer Gerhards
13ecf8a6ef step: config handler setting from syslogd.c moved to rsconf.c 2011-04-21 14:27:41 +02:00
Rainer Gerhards
f72bde2f70 milestone: templates are now in config object 2011-04-19 09:43:36 +02:00
Rainer Gerhards
b30e809a20 Merge branch 'v5-devel'
Conflicts:
	configure.ac
	doc/manual.html
	doc/rsyslog_conf.html
	runtime/msg.c
	runtime/rsyslog.h
	template.c
2011-03-31 17:08:01 +02:00
Rainer Gerhards
d2cce9852b bugfix: error return from strgen caused abort, now causes action to be ignored
...(just like a failed filter)
2011-03-29 11:48:45 +02:00
Rainer Gerhards
2fc70320e3 Merge branch 'v5-stable' into v5-beta
Conflicts:
	tests/Makefile.am
2011-03-16 15:08:53 +01:00
Rainer Gerhards
9e18ecc9bd fixed a regression of last patch and some cleanup 2011-03-16 15:04:43 +01:00
Rainer Gerhards
ce1860a0bc bugfix: failover did not work correctly if repeated msg reduction was on
affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
2011-03-16 14:40:36 +01:00
Rainer Gerhards
6c3ef4dacf Merge branch 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh
2011-03-11 10:24:58 +01:00
Rainer Gerhards
3866bd51bf bugfix(kind of): tell users that config graph can currently not be generated
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232
2011-03-08 18:29:33 +01:00
Rainer Gerhards
f813c01258 bugfix: discard action did not work under some circumstances
fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217
2011-03-07 18:55:13 +01:00
Rainer Gerhards
9568e7dbbb Merge branch 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/glbl.c
	tools/omdiscard.c
2011-02-18 10:51:14 +01:00
Rainer Gerhards
39406781e5 bugfix: minor race condition in action.c - considered cosmetic
This is considered cosmetic as multiple threads tried to write exactly
the same value into the same memory location without sync. The method
has been changed so this can no longer happen.
2011-02-17 15:12:54 +01:00
Rainer Gerhards
bcc3b2aef7 Merge branch 'v5-devel'
Conflicts:
	ChangeLog
	action.c
	plugins/imudp/imudp.c
	runtime/glbl.c
2010-12-17 13:20:55 +01:00
Rainer Gerhards
2181515805 bug fixes in action processing
- bugfix: action processor released mememory too early, resulting in
  potential issue in retry cases (but very unlikely due to another
  bug, which I also fixed -- only after the fix this problem here
  became actually visible).
- bugfix: batches which had actions in error were not properly retried in
  all cases
2010-12-17 10:43:55 +01:00
Rainer Gerhards
c12fd1e65b used a bit more stack (irrelevant) to gain a bit more performance...
... for large batches
2010-12-16 15:52:15 +01:00
Rainer Gerhards
b9ba5013ad bugfix: batch processing flagged invalid message as "bad" under some circumstances
also fixed some cosmetic nits
2010-12-16 14:23:38 +01:00
Rainer Gerhards
925b060b29 bugfix: potential abort when output modules with different parameter ...
... passing modes were used in configured output modules
2010-12-03 17:59:12 +01:00
Rainer Gerhards
f871bd135a bugfix: memory leak if different passing modes were used in actions 2010-12-01 17:50:29 +01:00
Rainer Gerhards
48877c8ef4 milestone: added support for CEE-properties in property-based filters 2010-12-01 17:28:36 +01:00
Rainer Gerhards
786a44a024 Merge branch 'v5-devel'
Conflicts:
	runtime/rsyslog.h
2010-11-25 18:04:00 +01:00
Rainer Gerhards
a3c81f500a bugfix: replacements for atomic operations for non-int sized types had problems.
At least one instance of that problem could potentially lead
to abort (inside omfile).
2010-11-25 17:20:55 +01:00
Rainer Gerhards
b8ffbecb78 Merge branch 'v5-devel' 2010-10-22 20:19:06 +02:00
Rainer Gerhards
096db025e2 fixing a potentially uninitialized variable 2010-10-19 04:03:43 -07:00
Rainer Gerhards
d72fe36f86 Merge branch 'master' into newconf
Conflicts:
	doc/manual.html
2010-08-05 08:50:55 +02:00
Steffen Sledz
676939f616 break potential infinite loop in actionDoRetry
If a module always returns RS_RET_OK (like ompipe does) the actionDoRetry
loop may not have leaved faked ACT_STATE_SUSP state in case iResumeOKinRow
had ever reached a count of 1000.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-08-05 07:48:36 +02:00
Rainer Gerhards
c97b1d3c72 added support to save/restore rsyslog core action settings...
... but not those of plugins (which are at least as important as
the core ones). So this is an interim commit.
2010-07-23 17:33:08 +02:00
Rainer Gerhards
e64cd21243 moving towards scoping inside rsyslog.conf
first step: adding object-type specifier to config statement table
2010-07-21 18:08:19 +02:00
Rainer Gerhards
0d721450eb added missing support for systems without atomic instructions 2010-06-24 14:01:05 +02:00
Rainer Gerhards
31fae7b93d bugfix: "$ActionExecOnlyWhenPreviousIsSuspended on" was broken
Note that, as it looks, the directive was already broken in previous v5 versions.
So while I solved what looked like a (intentional) regression from the
performance tuning, I actually solved a previous regression as well ;)

I have also added new test cases to the testbench in order to capture such
problems in the future. This version does now look pretty good in shape.
2010-06-24 12:13:48 +02:00
Rainer Gerhards
f48128f34a fixed a couple of regressions
by implementing some code that was missing so far ;) as well as
finding some real bugs. I also did some general cleanup, removing
debug strings and such. This code should be fairly OK to use, except
when "exec only when previous action was suspended" is used -- this is
NOT yet re-implemented in the tuned engine.
2010-06-23 12:48:27 +02:00
Rainer Gerhards
d6a3b08f56 fixed problem in action message induced failure handling 2010-06-21 12:43:44 +02:00
Rainer Gerhards
dc653ed74f minor cleanup 2010-06-21 11:53:52 +02:00
Rainer Gerhards
0577f7f182 fixed a problem with ACT_MESSAGE_PASSING type of doAction interface 2010-06-15 14:55:09 +02:00
Rainer Gerhards
802f6d8a8f milestone(BUGGY): batch now pushed down to action
at least in important cases (not for non-direct action queues and some
other minor things). This version is definitely buggy, but may be tried
with success on a non-production system. I will continue to work on the
correctness, but needed to commit now to get a baseline.
2010-06-15 14:02:34 +02:00
Rainer Gerhards
74135da959 some cleanup
as well as some work in preparation of storing doAction params inside
the batch
2010-06-10 12:24:22 +02:00
Rainer Gerhards
13b5c6b145 fixed regression for omruleset use case
I did not revert to using the action ppMsg data element, as one of the
next steps is to remove it by an overall much better solution.
2010-06-10 10:40:04 +02:00
Rainer Gerhards
d630bc742f Merge branch 'concurrent-output' into tmp 2010-06-10 10:18:59 +02:00
Rainer Gerhards
559cb84a79 fixing msg duplication & loss regression, causes slowdown
messages could get lost or be duplicated due to non-proper sync
of transactions. This is a notable slowdown again, but we know
how to get back concurrency, it just takes "some" more programming.
It is important now to come back to correct code, so that we can
base further improvements on that.
2010-06-10 10:17:04 +02:00
Rainer Gerhards
8fbcea4837 main msg q consumer now preprocesses messages before doing rule processing
things like ACL check and message parsing. This leads to a greater level
of concurrent processing. Beware, though, that this commit duplicates
some messages. May be a regression from this or an earlier commit. I will
soon sort out.
2010-06-09 15:37:00 +02:00
Rainer Gerhards
11bd517465 added support for high-performance action queue submission if not all mark messages should be logged
this was previously not properly handeld. This is also the first occurence of
a (real) CAS loop inside rsyslog. Note that the performance is now very well
in the default configuration, and mark message directives are still correctly
being handled. So this code looks close to final, but needs to have some
bug cleanup as the testsuite shows.
2010-06-08 15:20:33 +02:00
Rainer Gerhards
3e49a1075a performance enhancement: implemented stage 1 firehose mode for actions
... plus some other tests, namely string generation in parallel to action
processing. The code is not yet solid and not fully compatible to
older versions. But it is good enough for an early commit and some
early testing/gaining of experience.

The optimization was done based on the fine-grained partitioning
paradigm worked on the past couple of weeks -- seems to work out
really great :)
2010-06-08 12:46:24 +02:00
Rainer Gerhards
220c57e7eb bugfix: regression caused more locking action in msg.c than necessary
also: bugfix: mutexes used to similate atomic instructions were not destructed
2010-06-08 08:25:56 +02:00
Rainer Gerhards
af8582e509 added new cancel-reduced action thread termination method
We now manage to cancel threads that block inside a retry loop to
terminate without the need to cancel the thread. Avoiding cancellation
helps keep the system complexity minimal and thus provides for better
stability. This also solves some issues with improper shutdown when
inside an action retry loop.
2010-05-17 14:24:27 +02:00
Rainer Gerhards
ed7f89a49c Merge branch 'v5-stable' 2010-04-26 15:55:51 +02:00
Rainer Gerhards
149bab9cd1 cosmetic: removed left-over debug message 2010-04-26 15:55:33 +02:00