Skip to content

Commit 29ccbba

Browse files
authored
fix multipath.conf inconsistencies (#167)
* fix multipath.conf inconsistencies: - make sure we acknowledge find_multipaths no for all our supported OS - fix multipath template to include 3par device section Signed-off-by: Raunak <[email protected]>
1 parent cbcb199 commit 29ccbba

File tree

3 files changed

+43
-6
lines changed

3 files changed

+43
-6
lines changed

tunelinux/config/multipath.conf.generic

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,23 @@ devices {
4444
prio alua
4545
failback immediate
4646
}
47+
device {
48+
vendor "3PARdata"
49+
product "VV"
50+
path_grouping_policy "group_by_prio"
51+
path_selector "round-robin 0"
52+
path_checker tur
53+
features "0"
54+
hardware_handler "1 alua"
55+
prio "alua"
56+
failback immediate
57+
rr_weight "uniform"
58+
no_path_retry 18
59+
rr_min_io_rq 1
60+
detect_prio yes
61+
fast_io_fail_tmo 10
62+
dev_loss_tmo "infinity"
63+
}
4764
device {
4865
rr_weight priorities
4966
uid_attribute ID_SERIAL

tunelinux/config/multipath.conf.upstream

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,23 @@ devices {
4646
prio alua
4747
failback immediate
4848
}
49+
device {
50+
vendor "3PARdata"
51+
product "VV"
52+
path_grouping_policy "group_by_prio"
53+
path_selector "round-robin 0"
54+
path_checker tur
55+
features "0"
56+
hardware_handler "1 alua"
57+
prio "alua"
58+
failback immediate
59+
rr_weight "uniform"
60+
no_path_retry 18
61+
rr_min_io_rq 1
62+
detect_prio yes
63+
fast_io_fail_tmo 10
64+
dev_loss_tmo "infinity"
65+
}
4966
device {
5067
rr_weight priorities
5168
uid_attribute ID_SERIAL

tunelinux/multipath.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ package tunelinux
33
// Copyright 2019 Hewlett Packard Enterprise Development LP.
44
import (
55
"errors"
6-
"github.com/hpe-storage/common-host-libs/linux"
7-
log "github.com/hpe-storage/common-host-libs/logger"
8-
"github.com/hpe-storage/common-host-libs/mpathconfig"
9-
"github.com/hpe-storage/common-host-libs/util"
106
"io/ioutil"
117
"os"
128
"regexp"
139
"strconv"
1410
"strings"
11+
12+
"github.com/hpe-storage/common-host-libs/linux"
13+
log "github.com/hpe-storage/common-host-libs/logger"
14+
"github.com/hpe-storage/common-host-libs/mpathconfig"
15+
"github.com/hpe-storage/common-host-libs/util"
1516
)
1617

1718
const (
@@ -276,7 +277,10 @@ func setMultipathRecommendations(recommendations []*Recommendation) (err error)
276277
}
277278
}
278279
if err == nil {
279-
if value := (defaultsSection.GetProperties())["find_multipaths"]; value == "yes" {
280+
// if we find_multipaths key with yes value or if the key is absent (in case of Ubuntu)
281+
// set it to no
282+
value := (defaultsSection.GetProperties())["find_multipaths"]
283+
if value == "yes" || value == "" {
280284
(defaultsSection.GetProperties())["find_multipaths"] = "no"
281285
}
282286
}
@@ -353,4 +357,3 @@ func ConfigureMultipath() (err error) {
353357
}
354358
return nil
355359
}
356-

0 commit comments

Comments
 (0)