mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 11:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove dead code

Browse Source 
Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
This commit is contained in:
Madhu Rajanna 2019-01-17 10:37:59 +05:30
parent eaadeec2dc
commit 9f76f6bd59
6 changed files with 27 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cephfs/cephconf.go
View File

@ -68,10 +68,6 @@ func init() {
cephSecretTempl = template.Must(template.New("secret").Parse(cephSecret)) cephSecretTempl = template.Must(template.New("secret").Parse(cephSecret))
} }
type cephConfigWriter interface {
writeToFile() error
}
type cephConfigData struct { type cephConfigData struct {
Monitors string Monitors string
VolumeID volumeID VolumeID volumeID

1
pkg/rbd/rbd.go
View File

@ -47,7 +47,6 @@ type rbd struct {
} }
var ( var (
rbdDriver *rbd
version = "1.0.0" version = "1.0.0"
) )

12
pkg/rbd/rbd_attach.go
View File

@ -46,18 +46,6 @@ func init() {
hasNBD = checkRbdNbdTools() hasNBD = checkRbdNbdTools()
} }
func getDevFromImageAndPool(pool, image string) (string, bool) {
device, found := getRbdDevFromImageAndPool(pool, image)
if found {
return device, true
}
device, found = getNbdDevFromImageAndPool(pool, image)
if found {
return device, true
}
return "", false
}
// Search /sys/bus for rbd device that matches given pool and image. // Search /sys/bus for rbd device that matches given pool and image.
func getRbdDevFromImageAndPool(pool string, image string) (string, bool) { func getRbdDevFromImageAndPool(pool string, image string) (string, bool) {
// /sys/bus/rbd/devices/X/name and /sys/bus/rbd/devices/X/pool // /sys/bus/rbd/devices/X/name and /sys/bus/rbd/devices/X/pool

4
pkg/rbd/rbd_util.go
View File

@ -30,11 +30,7 @@ import (
const ( const (
imageWatcherStr = "watcher=" imageWatcherStr = "watcher="
rbdImageFormat1 = "1"
rbdImageFormat2 = "2" rbdImageFormat2 = "2"
imageSizeStr = "size "
sizeDivStr = " MB in"
kubeLockMagic = "kubelet_lock_magic_"
// The following three values are used for 30 seconds timeout // The following three values are used for 30 seconds timeout
// while waiting for RBD Watcher to expire. // while waiting for RBD Watcher to expire.
rbdImageWatcherInitDelay = 1 * time.Second rbdImageWatcherInitDelay = 1 * time.Second

2
pkg/util/cachepersister.go
View File

@ -35,7 +35,7 @@ type CachePersister interface {
Delete(identifier string) error Delete(identifier string) error
} }
func NewCachePersister(metadataStore string, driverName string) (CachePersister, error) { func NewCachePersister(metadataStore, driverName string) (CachePersister, error) {
if metadataStore == "k8s_configmap" { if metadataStore == "k8s_configmap" {
glog.Infof("cache-perister: using kubernetes configmap as metadata cache persister") glog.Infof("cache-perister: using kubernetes configmap as metadata cache persister")
k8scm := &K8sCMCache{} k8scm := &K8sCMCache{}

9
pkg/util/k8scmcache.go
View File

@ -119,12 +119,12 @@ func (k8scm *K8sCMCache) Create(identifier string, data interface{}) error {
if cm != nil && err == nil { if cm != nil && err == nil {
glog.V(4).Infof("k8s-cm-cache: configmap already exists, skipping configmap creation") glog.V(4).Infof("k8s-cm-cache: configmap already exists, skipping configmap creation")
return nil return nil
} else { }
dataJson, err := json.Marshal(data) dataJSON, err := json.Marshal(data)
if err != nil { if err != nil {
return errors.Wrap(err, "k8s-cm-cache: marshal error") return errors.Wrap(err, "k8s-cm-cache: marshal error")
} }
cm := &v1.ConfigMap{ cm = &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: identifier, Name: identifier,
Namespace: k8scm.Namespace, Namespace: k8scm.Namespace,
@ -134,7 +134,7 @@ func (k8scm *K8sCMCache) Create(identifier string, data interface{}) error {
}, },
Data: map[string]string{}, Data: map[string]string{},
} }
cm.Data[cmDataKey] = string(dataJson) cm.Data[cmDataKey] = string(dataJSON)
_, err = k8scm.Client.CoreV1().ConfigMaps(k8scm.Namespace).Create(cm) _, err = k8scm.Client.CoreV1().ConfigMaps(k8scm.Namespace).Create(cm)
if err != nil { if err != nil {
@ -145,7 +145,6 @@ func (k8scm *K8sCMCache) Create(identifier string, data interface{}) error {
return errors.Wrapf(err, "k8s-cm-cache: couldn't persist %s metadata as configmap", identifier) return errors.Wrapf(err, "k8s-cm-cache: couldn't persist %s metadata as configmap", identifier)
} }
}
glog.V(4).Infof("k8s-cm-cache: configmap %s successfully created\n", identifier) glog.V(4).Infof("k8s-cm-cache: configmap %s successfully created\n", identifier)
return nil return nil
} }