Merge pull request #7459 from leseb/rm-used

ceph: remove unsed type field
This commit is contained in:
Sébastien Han authored and GitHub committed 2021-03-24 17:18:46 +01:00
commit 4ef2162d17
2 files changed
+2 -4

No files matched your search

+1 -1
View File
@@ -511,7 +511,7 @@ func (r *ReconcileCephObjectStore) startMonitoring(objectstore *cephv1.CephObjec
return
}
rgwChecker := newBucketChecker(r.context, objContext, serviceIP, port, r.client, namespacedName, &objectstore.Spec.HealthCheck, r.clusterSpec.External.Enable)
rgwChecker := newBucketChecker(r.context, objContext, serviceIP, port, r.client, namespacedName, &objectstore.Spec.HealthCheck)
logger.Info("starting rgw healthcheck")
go rgwChecker.checkObjectStore(r.objectStoreChannels[objectstore.Name].stopChan)
}
+1 -3
View File
@@ -47,11 +47,10 @@ type bucketChecker struct {
client client.Client
namespacedName types.NamespacedName
healthCheckSpec *cephv1.BucketHealthCheckSpec
isExternal bool
}
// newbucketChecker creates a new HealthChecker object
func newBucketChecker(context *clusterd.Context, objContext *Context, serviceIP, port string, client client.Client, namespacedName types.NamespacedName, healthCheckSpec *cephv1.BucketHealthCheckSpec, isExternal bool) *bucketChecker {
func newBucketChecker(context *clusterd.Context, objContext *Context, serviceIP, port string, client client.Client, namespacedName types.NamespacedName, healthCheckSpec *cephv1.BucketHealthCheckSpec) *bucketChecker {
c := &bucketChecker{
context: context,
objContext: objContext,
@@ -61,7 +60,6 @@ func newBucketChecker(context *clusterd.Context, objContext *Context, serviceIP,
namespacedName: namespacedName,
client: client,
healthCheckSpec: healthCheckSpec,
isExternal: isExternal,
}
// allow overriding the check interval