mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-09 16:00:22 +00:00
rbd: check nbd tool features only for rbd driver
calling setRbdNbdToolFeatures inside an init gets called in main.go for both cephfs and rbd driver. instead of calling it in init function calling this in rbd driver.go as this is specific to rbd. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
parent
539050a857
commit
dffb6e72c2
@ -153,6 +153,8 @@ func (r *Driver) Run(conf *util.Config) {
|
||||
log.FatalLogMsg(err.Error())
|
||||
}
|
||||
rbd.SetGlobalInt("krbdFeatures", krbdFeatures)
|
||||
|
||||
rbd.SetRbdNbdToolFeatures()
|
||||
}
|
||||
|
||||
if conf.IsControllerServer {
|
||||
|
@ -92,10 +92,6 @@ var (
|
||||
}
|
||||
)
|
||||
|
||||
func init() {
|
||||
setRbdNbdToolFeatures()
|
||||
}
|
||||
|
||||
// rbdDeviceInfo strongly typed JSON spec for rbd device list output (of type krbd).
|
||||
type rbdDeviceInfo struct {
|
||||
ID string `json:"id"`
|
||||
@ -216,8 +212,9 @@ func waitForPath(ctx context.Context, pool, namespace, image string, maxRetries
|
||||
return "", false
|
||||
}
|
||||
|
||||
// set features available with rbd-nbd, and NBD module loaded status.
|
||||
func setRbdNbdToolFeatures() {
|
||||
// SetRbdNbdToolFeatures sets features available with rbd-nbd, and NBD module
|
||||
// loaded status.
|
||||
func SetRbdNbdToolFeatures() {
|
||||
var stderr string
|
||||
// check if the module is loaded or compiled in
|
||||
_, err := os.Stat(fmt.Sprintf("/sys/module/%s", moduleNbd))
|
||||
|
Loading…
Reference in New Issue
Block a user