Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Rook
Commits
5c59a1e4
Unverified
Commit
5c59a1e4
authored
5 years ago
by
Travis Nielsen
Committed by
GitHub
5 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #3742 from travisn/debug-logging
Clean up verbose Ceph logging
parents
09c4858e
a9deac7d
master
mergify/bp/release-1.5/pr-6679
release-1.1
release-1.2
release-1.3
release-1.4
release-1.5
v1.5.1
v1.5.0
v1.5.0-beta.0
v1.5.0-alpha.0
v1.4.7
v1.4.6
v1.4.5
v1.4.4
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.4.0-beta.0
v1.4.0-alpha.0
v1.3.11
v1.3.10
v1.3.9
v1.3.8
v1.3.7
v1.3.6
v1.3.5
v1.3.4
v1.3.3
v1.3.2
v1.3.1
v1.3.0
v1.3.0-beta.1
v1.3.0-beta.0
v1.2.7
v1.2.6
v1.2.5
v1.2.4
v1.2.3
v1.2.2
v1.2.1
v1.2.0
v1.2.0-beta.1
v1.2.0-beta.0
v1.1.9
v1.1.8
v1.1.7
v1.1.6
v1.1.5
v1.1.4
v1.1.3
v1.1.2
v1.1.1
v1.1.0
v1.1.0-beta.1
v1.1.0-beta.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pkg/operator/ceph/cluster/controller.go
+3
-3
pkg/operator/ceph/cluster/controller.go
pkg/operator/ceph/disruption/clusterdisruption/reconcile.go
+1
-1
pkg/operator/ceph/disruption/clusterdisruption/reconcile.go
with
4 additions
and
4 deletions
+4
-4
pkg/operator/ceph/cluster/controller.go
+
3
-
3
View file @
5c59a1e4
...
...
@@ -486,11 +486,11 @@ func (c *ClusterController) onK8sNodeUpdate(oldObj, newObj interface{}) {
// Checking for NoSchedule added to storage node
if
oldNodeSchedulable
==
false
&&
newNodeSchedulable
==
false
{
logger
.
Debugf
(
"
Skipping cluster update. Updated node
%s
was and is still unschedulable
"
,
newNode
.
Labels
[
v1
.
LabelHostname
])
//
Skipping cluster update. Updated node was and is still unschedulable
return
}
if
oldNodeSchedulable
==
true
&&
newNodeSchedulable
==
true
{
logger
.
Debugf
(
"
Skipping cluster update. Updated node
%s
was and
it
is still schedulable
"
,
oldNode
.
Labels
[
v1
.
LabelHostname
])
//
Skipping cluster update. Updated node was and is still schedulable
return
}
...
...
@@ -711,7 +711,7 @@ func (c *ClusterController) onDeviceCMUpdate(oldObj, newObj interface{}) {
for
_
,
cluster
:=
range
c
.
clusterMap
{
if
cluster
.
Info
==
nil
{
logger
.
Info
(
"Cluster %s is not ready. Skipping orchestration on device change"
,
cluster
.
Namespace
)
logger
.
Info
f
(
"Cluster %s is not ready. Skipping orchestration on device change"
,
cluster
.
Namespace
)
continue
}
logger
.
Infof
(
"Running orchestration for namespace %s after device change"
,
cluster
.
Namespace
)
...
...
This diff is collapsed.
Click to expand it.
pkg/operator/ceph/disruption/clusterdisruption/reconcile.go
+
1
-
1
View file @
5c59a1e4
...
...
@@ -92,7 +92,7 @@ func (r *ReconcileClusterDisruption) reconcile(request reconcile.Request) (recon
logger
.
Debugf
(
"discovered NamespacedName: %s"
,
request
.
NamespacedName
)
}
r
.
namelessRetries
=
0
logger
.
Info
f
(
"reconciling %s"
,
request
.
NamespacedName
)
logger
.
Debug
f
(
"reconciling %s"
,
request
.
NamespacedName
)
// get the ceph cluster
cephCluster
:=
&
cephv1
.
CephCluster
{}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help