Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Benjamin J. Thompson
Tor
Commits
b98614f1
Commit
b98614f1
authored
7 years ago
by
Matt Traudt
Committed by
Nick Mathewson
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Only log about lost KIST support once
parent
8b2c01a4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changes/ticket24158
+3
-0
3 additions, 0 deletions
changes/ticket24158
src/or/scheduler.c
+22
-2
22 additions, 2 deletions
src/or/scheduler.c
with
25 additions
and
2 deletions
changes/ticket24158
0 → 100644
+
3
−
0
View file @
b98614f1
o Minor bugfixes (logging):
Only log about no longer having KIST support once. Fixes bug 24158; bugfix
on 0.3.2
This diff is collapsed.
Click to expand it.
src/or/scheduler.c
+
22
−
2
View file @
b98614f1
...
...
@@ -171,6 +171,8 @@ STATIC smartlist_t *channels_pending = NULL;
*/
STATIC
struct
event
*
run_sched_ev
=
NULL
;
static
int
have_logged_kist_suddenly_disabled
=
0
;
/*****************************************************************************
* Scheduling system static function definitions
*
...
...
@@ -252,13 +254,31 @@ select_scheduler(void)
case
SCHEDULER_KIST
:
if
(
!
scheduler_can_use_kist
())
{
#ifdef HAVE_KIST_SUPPORT
log_notice
(
LD_SCHED
,
"Scheduler type KIST has been disabled by "
"the consensus or no kernel support."
);
if
(
!
have_logged_kist_suddenly_disabled
)
{
/* We should only log this once in most cases. If it was the kernel
* losing support for kist that caused scheduler_can_use_kist() to
* return false, then this flag makes sure we only log this message
* once. If it was the consensus that switched from "yes use kist" to
* "no don't use kist", then we still set the flag so we log once, but
* we unset the flag elsewhere if we ever can_use_kist() again.
*/
have_logged_kist_suddenly_disabled
=
1
;
log_notice
(
LD_SCHED
,
"Scheduler type KIST has been disabled by "
"the consensus or no kernel support."
);
}
#else
/* !(defined(HAVE_KIST_SUPPORT)) */
log_info
(
LD_SCHED
,
"Scheduler type KIST not built in"
);
#endif
/* defined(HAVE_KIST_SUPPORT) */
continue
;
}
/* This flag will only get set in one of two cases:
* 1 - the kernel lost support for kist. In that case, we don't expect to
* ever end up here
* 2 - the consensus went from "yes use kist" to "no don't use kist".
* We might end up here if the consensus changes back to "yes", in which
* case we might want to warn the user again if it goes back to "no"
* yet again. Thus we unset the flag */
have_logged_kist_suddenly_disabled
=
0
;
new_scheduler
=
get_kist_scheduler
();
scheduler_kist_set_full_mode
();
goto
end
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment