From b9ad4cb57ba1746c26bd92167534becdc1359df9 Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: Fri, 2 Mar 2018 16:41:39 +0100
Subject: [PATCH] Fix iSCSI image

- create 120MB LUN instead of 1MB for volume_io tests
- increase verbosity
- rebase to Fedora 26
  - targetcli now requires running dbus, so run it
---
 test/images/volumes-tester/iscsi/Dockerfile   |   5 +++--
 test/images/volumes-tester/iscsi/Makefile     |   2 +-
 test/images/volumes-tester/iscsi/block.tar.gz | Bin 1670 -> 128725 bytes
 .../volumes-tester/iscsi/create_block.sh      |   5 +++--
 .../images/volumes-tester/iscsi/run_iscsid.sh |  16 +++++++++++++---
 .../volumes-tester/iscsi/saveconfig.json      |   2 +-
 test/utils/image/manifest.go                  |   2 +-
 7 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/test/images/volumes-tester/iscsi/Dockerfile b/test/images/volumes-tester/iscsi/Dockerfile
index ff3ab35fb7..26eccb59d5 100644
--- a/test/images/volumes-tester/iscsi/Dockerfile
+++ b/test/images/volumes-tester/iscsi/Dockerfile
@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM fedora
-RUN yum install -y iscsi-initiator-utils targetcli net-tools strace && yum clean all
+FROM fedora:26
+
+RUN yum install -y iscsi-initiator-utils targetcli net-tools strace procps-ng psmisc && yum clean all
 ADD run_iscsid.sh /usr/local/bin/
 ADD initiatorname.iscsi /etc/iscsi/
 ADD block.tar.gz /
diff --git a/test/images/volumes-tester/iscsi/Makefile b/test/images/volumes-tester/iscsi/Makefile
index 85b6d6b0e9..d5b295fd7f 100644
--- a/test/images/volumes-tester/iscsi/Makefile
+++ b/test/images/volumes-tester/iscsi/Makefile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = 0.1
+TAG = 0.2
 PREFIX = staging-k8s.gcr.io
 
 all: push
diff --git a/test/images/volumes-tester/iscsi/block.tar.gz b/test/images/volumes-tester/iscsi/block.tar.gz
index 8576d132c8dc37e9721a74131add2eb12e303f22..8840f543869588c24ab14e3079cc9e4cab91ebfb 100644
GIT binary patch
literal 128725
zcmeI*YgAKL76)(?72nj>M-eN`*cufTS`?(bYCBayF)dZGRlp|{5l}%uAw;CssZ_C`
zf*_<S5E-5d3IYKU6%h~(&j2AP2!yARKu93TU}tgehjyl2v!+w3e?Gy!_w2pT@7zZ|
zWF52u$E#fL6@ICr+EMEj)@<|TJ&~7#!QVc4BX8BT6?qfCuHO6c=&O%rY)JXr=PCQF
z|B}M9;;l)!I{ou$Gwv>Jn{fBr>S<XQc}^#|qA^Y@7cN>utEX$*t-SW*s=psFV{H|b
zm<;#`I*QM7Xi`TyFH2cI;AWQXSs*HS$BQRuoX9kPlF?W%5xrk9*Zp?XPI|TbpeVhj
z!^}Y<D(K*)@wJ*u+dpVwc{Mb-Z>hbI#Z>yM_hqX0&S_9asKwg2x}4(FJM?5Yy1CT*
z<~gJuyxY>rF>QNZ(p>0vvni^gvYES<ez>u6cXIr|i%>g7j&p2)u+qu6Gdhs&+fvfE
zwPk$}<4#nS>EKlQ&8~c94|{)+s$-<>JB+@<mb%8ibR(~BPTwFsCp=NT@A(C1b6HpE
zO({Q08f`PD?$FaH8~!Cb-=={mTTy$zz~c(N_3!Ehy5p2q#?mR7I`5pT-+%e|J2@O)
zuc9>QL667g51-!awQZ2I-1tj1>BhqQ5xxyQks&?$!juqoks{y_v&P8#?-Khkmc?<~
zm%p5mup<MfiWGq_PYE14W$=2WC--cQ@=Btwe2Y|;K2_A)B6n)>v{5J$qgtHUT2G~U
zCUj#pb&+q=p&E_j-hQ7){glGD`B05TRh{%!OM(kKCTdmqLFOanH>0&a^}JqQwkFke
z;P}QlmDcomC7GRCoA#ePcX+l_rHeA<ME;gGr|2)!<@t-uVt*P|Yo73QCkdYVI*$E=
z1HVr_KEq+H>B(j7H<+96{;;HX88@L;v3*9>p5ep&86>51`fx>GUoz(4SHpFZYKPkp
zO(2O_)g)*^1?xy~AqiGF50}jFBiW~r?5<RzI5NhNw3)G=jIknPz9O;DsUa@IW%|>|
z%;;_;_&o`h?j^wlD(E^K%=nUIFCnb1kIBr8NJ$of+3!KdEFoh&3G1A);n7$BwbU=y
zteVtrBolM37(Q`7wGtG1I@P2VDfk`LPu1{fk(31OACcfO5=<vp8MY)*C+WP4jM-m6
zx-=%&W!+73;RTY`b23P9DXHT{>huSbM7mV)8VP1m**PRp5$P!B5((;1!GDloG)a_9
zjQYb#&?k*t;VxvpRaD7TlE{wqZZ9BkQ%F!iU9DCmC?O?VNsLAo{{nY7&;C86wi7v#
zO`S-tvHdL4`M{0g&M)vto?PlM8QnotSHus`W`{i~s31d9iQhw~;cI?H`tXpa+2ll3
z(qjv$;_FT_s*<H&N}f61+sNT`irkqB5^`T367(Wxnp`1mP>BLazjKMC=n?7iIF-_o
zq@*5_IRxWr7D<#t-G$T0Bn9Md7TqV=yUD|=pAyuf=DUHER3{5H_!$XaCMEr-+ha9>
z^GhT1EuezgBuJxz*GP~}f^*4ZMN~$nVNL~8N$@fmeVa_JfHZ89L=KC{5IUJ;|4lN6
zMLkcCk)S>GJdGhi8p%F*fN+G6*8O5gNgK*2kp!!#Al17e6{J?RkaV2OAHG3EXGk9c
za*g-%sUWqgauPJBCY(<N$&0AJkp!uSUQ`V!NxgKaJKBWm{XA)tNnOQkDo9@Sq82Jh
z9tfgPDo9=tBI@nsNN!LQ>e9YR#*|X?Z6~wHB{JUBds#p&8}(wCM3&8tdi-4?iDr@F
z+0kSHV@PpbQr!Cxxe^3qOfkt5NS4=*nz%a2lT0o%?~No+JT->8?rTWOwN&TSyD^BQ
zRF;$FlaVoo<Z+aJl}v|v*ej{eIJ#6K>N;p9iKr*w;1<&G7SeD%wd8$d4D~F`rrt@m
zq)s<^(|FTKN<yu%Iwqv-nDFV#PmEX3%H4J=xA2secMlGI+Sp+{Ab6-qPgQmX{`843
z#^$kA($nPbtSMU=OF4ZNat+^T+lp@Q=Z_m-Y&4NB39ajSVHWJ{EAQ;dPtqCa^)jgK
z_OX(i-`*k*8m%=>P3wY|XLn7nf3EU|LG5b0>&(8SPIdY0B)eG^5*FX4PwwdB&e6&4
za*--}`oyQi55-C1E^(BHuyVJqU~f!kT92S#qUaw~WIb$t;3rR%-RRE=;wF7EsH&Kh
z)Eh=i%OA8Gqw+faG${Q$J(?Vx2U?Z=-aZ4ZbE=99SQ$n;e7Y4qQ|q37FK_8KPK<If
zC>0p(XfI~4BmMFoOHB7w*2njLp_X*1Mmj^HY>t$4X>Gof6hH8mN|HgJdiyoz=1_Tl
zW`|bgZe_~Sf#U~x<_SfL?Y93q#O<qeNKHM|oqi;ryPW$(xRYBDJI^3gso`JJ{FShg
zd%diH-5%W@ORp|x&8XRHwvcf^cE*F_A@>OI$QQ>6R|)S4=f}ld=314pW9W3&4`%v|
zO|lM;RF58yK(Ud~{R{cyZ??qpg<)y5cOp)$O}8vyzr{@~bK!m`?BTYsb=TO3xkk8#
zy0W@XcZGGG>AH}!fU!SwZKks<SR5lP;_|utvQT#N8vFA(iz3hDe8{lMTrH~+9~4Fj
z?S$=RhS6^81ZTP;4}WMB8NA+#9aC1OAv6=_2#Y;(J(L@m<!uRRx}9`KwmbKxFxx{r
zl9gj*s%?9EZdlHH3}@L5ai`Fj8^FyIH;7M*ABj`Mk-{g!EUp*3+ahR<AY$(M99;%e
z<}bb?4iFyaUM^E-Ygw3w`z@Ax%f1tb2-)17TsoU&VIHw6Q_s}Ebg8MC>0jhqWm54Z
z;jA*<7+S3Tdb(w9u-|g|SF&EQrqHm=Er!MxtfyP#hWHuE?PPMXnozw=E5>~NtQdAI
zJBH16jCPDQw_t`V7RwLG0>z=iWNs=qwalICUe?34XXjd!(wPy8r5tUJ9%lh(1?OGP
zGR|U-iJTEGd@4R6Ru`TXZWLAsmkX~8gT<NRAR&v}UZ%;_EQ{cpvzZpk@cIk&!HOlE
z<(wrPQ_eh&K1YXR%%Rza8}Q_nn;0qb%tT34#H<VQ)8VoKqrus_32y44E~!y0FIm05
zB$AoO^wW6Gye}PC&(H1tekkHs!znf2uUsfGmY1ta%p`YuB%P+xGi8!yn)(Ir`mXo^
z_t)z_ex06K|8cHnnRU;^93M%#{zE=<lW|Y9ag;~ZyreGr`2RQz2O$6f2tWV=5P$##
zAOHafKmY;|fB*y_009U<00Izzz#k~kAmGLAtXObKZ{jU|AN?`wK1#dxILx}Ua@F3+
zJK|5CwS6((v&L%YM4h}@YsTnYonGs*w|B<Y#~(**h?`#d)~fBF960ud$I2Wxqsfve
z>Gq`^lmEb}pfm*jXaQQ!3Td4|mF}{VB8f|?@`_W9RPo}pV^RK#5=E7om3{<YpxLEa
z86a@iv0zo4+`8JrBGxe1UW1j@^HkVh+t-=ilCI=B)tH}EFEz`RJZa;5C7bs?tLQJf
z9uQ%}JlNCH@2Eaz(xw+`ww9Sq1$SvhmmP%ra-+<I!TO<7b4DK@@SNA}Z5>>3{W631
zU_IAmWAi{UEhf3R+kqzZ)aeN+rtP*q&l>t8_N;Vpm4(HrNP9PTg+Ys(PD`n;wZSQt
zn_(GkcPdvR4B^_yBE=TGIB|&B;`|0#kT4`T;ml>zKbrWDtzR4w`5^IAbF*6$E_4N|
zDMLQZJ^9Brgz6B000bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fWR*c+@gE7
z{WwlV<s1L7F@y1A)w0)UU);ElHRYGjMic_Ctbl9broAnrCbwy+oAK=Cy|UB9#2^3x
z2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZaf!9`Gy79q;*`H2dHLCw%{p3+^
zy^*+gS?q?a>(ev?s`u>N9cpqk(z7h=w&nA&Z{}GpzU!&Eg)!D9?a};=i;nev^Lh2@
z@3mLjG!1;4uO}&1ci-;t+A?C|e_nwj%;Nl}onItH={%Fx#&(!5h&kV_+jr<%oqbM?
z(l_}GucOP3Y0u;j7^Me$#GG?B3JMNim(1iWGjng}HHtzzBa%y9l^6NTau;>8{0_J9
zpVhkA`L(tMir6}8hRKT7W{Ie3?)aGr&0}pXYnp1MtBWpQ^T@ELv(gIVCaE#~^BJi>
zxS7Niw$(h&aozo%Q~J2(tYX@A%`icUCAVv8G5rHpdEu?WWjYqd?}U}UZ@K3{$Kc@*
zxgn3KpQ0?L9c=8EI_NX34b@~z8P-|;el&))*EpGlEPDMo+0d>B;R)r~;~?_>$(MT^
zxUJx6sViuKirJ(7ycaAwhX4d1009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##
zeqG>5cSrfkp{)_dtG+*>-)7QO?;k$;IKIJ5^Vdh>3<!(_fx6(t>W8Xtmz&S^y~bHJ
z5;{T;5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1V*I50?)S1%TFx$
ze)RK5j>hQu+F$X$UKi)-JkMa<)rxx$mL3{o+!_1+v9k@6-aUGD^NCJ_8?uQ>UthHP
z$A*dR6E3IxMPudBr2CR7$G3N#*J{39JR+xvrd~|}W!Uk;g4nI5HV=Bzt$57OEcFHU
z9X-2l=K5Y&O6?Y=^7tG@jv`ay?)sk4a!b-P6U#jxa1_1V{^CT(paT0FZaHRI^5dRm
zga628%7l?#p>DZ{q!;6L@3E5R)Md*qM+ge+eY7{HgwOI==oI4CqO~OG0r!cYDT6zo
zy>!mt*r}3|RXL*Q`SH%H2Qtr|jpok|>mJ(Hz;&CSp^inCv7ULMuQg4zr!3*!PLFM7
z1q<Q|ulBTC^$B(<OKvIjS>-1iTOvxt7W_G_Sz?RMak9vv-!)ok!jKO&S_N$So@>@Y
zeXr)q{nlCOxq1H8aHhOpCHKiLrb$0*vCMhQZyk&CAOHafKmY;|fB*y_009U<00Izz
z00bZa0SG_<0uX=z1Rwx`*IOVb^$WG-Dk|EO@4VY!zhp(jr=uq%9v#^GdZS?Wzq`P`
zwKsMct8e>E>HWO058L?v?%pT>0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_
z009U<;K%AXX2pU_D<<CZ>T}qvH|p_&d*%x(TwU(m)4ox&nfG4MHa34*Y|5Ly{(nn(
zbM00By-oIcGnS-XwTwxL(wnFmJnh}q6TX6dZ#PFt^R|X*02BhhBG91Kqb+@OM#s_e
zP+#mqAIVy$nFEs;bAtwoLVZ|W=RRNwq+CIjy~OWf;(S|;(0HSu;PB!k24{uQ!5-n|
z!j?|W<n?aKi~MD|i@GCy4-9n1Y)Q7y?r!TTEGQZ<OqRFKl!&V4jz5>sJl58trm2>9
zyz%odjjEH`^qQtSH|4pv@^X0h4Wr6;bq+qsaozo%Q~J2(tYX@A%`icUCAVv8F@0zw
z1L3W~#X1(onqj5yTkbi~G<Y~fZpdTmrzneQ2OC?Z4*CphLp9k_hIN*|AB|z{HBROv
zi(aoL^Ad)HCsgK}{))jXet2=XR#ES6bF*7+E9$k>6|^D+z5()zFFB?M0SG_<0uX=z
z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_0D%!FaHPAVeB~4smGP?YPw2OqG}Zfuk3NoX
zFw-1yjiR9uAy5~bSp87-?Q-+EzSlUbMnp?!0s;_#00bZa0SG_<0uX=z1Rwwb2tWV=
z5P$##AOHafKmY;|fB*!3i@*ZUHv8o#7MvRWJd&evbiVdiynb3tP2$Pwx9@Dy)X8d^
z){z!*Z~CUAx~Io)+OhCPZFQSY#-&g9CRi^_pnZS)+g)QOWd2oPIOp4&j(&Qx9LD{Y
zk~rtjD9~SEvd+xlSsTwfD%a&feSmeiRI!6aE0RBp=kR@EiXFUi#gg7C4$ED~!e;#$
z=a-uttV?EcmYFfyd5xl$#E9h5z4Cu;a=<!#xP||$*3HhZwJlJ@)*0I5K+)R#(<TQq
zUv6?>Ikd^a&DBMhuX&`{uVtkb7WND<{R0@OQEn!2g>A?38T?{PuItoduk-XhhI+Xn
zXQTNVVXR$daUuRvr%l10AL_Aoo+)p-FTFm0!0npSVVm+iy-oJGr(~5Z+I6znRu=84
zD)$`vU0oa^wuqc8?k=M(|1$2l&!2H&{&zix85*C{4D|CoBG{L0K6j8lQ@(uk|1LW+
zK>z{}fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5cq!z2zYS;vsF~y7`Nli
z=gBkYJpZfzH=FVp2LI0%Q0sRW$artd)krnHD@>FAT|Os&_i`uz0SG_<0uX=z1Rwwb
z2tWV=5P$##AOHafKmY;|fB*y_009U<00JXU;4}O;g%P(VztqsawKsMct8e>E>HWO0
zZ}zBPIt4KZKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P-nH6&U(&
z3O^404}@?0!^RB8k5$WFqkVDXKGu|fdp-{Qw*n34_TKfJd+SGqs3D{i+tmNJj2H(2
z2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0{@l3bmN1csj8^l{%GB3
zMa5B7yLV4NT9i>b^o;@h{7m5165feUlOrqTjd`?M=P^G!jsOH8009U<00Izz00bZa
z0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKwzW_oQVAJ%Fu50+qLJ9QtrtcrTgZZuV>Ub
z4t-<bmHauf<=TweLn;BXf&luBs`0Pn95E>fKmY;|fB*y_009U<00Izz00bZa0SG_<
z0uX=z1Rwwb2tWV=5P-nX1uD$mIjf?QuQ&aSUXgo_QLDYvM6Ypk$Bh2@nIk2#>rhNt
rWbQ$&)^f&kld`~1P6-W1aJM5x4Shi16%<G*Qd{!fy6q}&pH}-P&Nhj9

delta 710
zcmV;%0y+KF?FWVpe;<no0Pt|1RR9C+-A!*3M;HL$wVgs0kPwJUZ7E<{K7=Z{PH~bp
zH|Qlf^wOwjnhys;H{K|*5fTSdegQXBsZx9Bp_iU|sCw&<K!P8@38?}k4!u<AjP0O=
zPbI;&&_0j!de=L%o_8g`a~XSgHqGX~PkO5wjMZxGZLnoqf9vj#d_Gzm9~-Zp8w<xr
zs-xqhNx9nNyxLl;&6$;QIa$fF=BxU>t{vblvld^5lH^?2+$$wXoZ||cJCr*S`#oCz
z`P&$UWPN@5VWHhGzTfD&ao)b}=YA2Q*gbyryGv*PNT(kE-un0YgVLd&p3UR4=F)PE
z%4D@R`Q=D9fAh`N9b8T6m978%_1p1QW$N}XKi0nf^SvjJVqW{ZZJV#-O)9+P_;4=<
zgKgRqVsD6dlUV=FP_IJ+&IkYi0C>~ZgBybzer+8XoC8}6a?t4j{j*W`8*6*LS_gZX
zf6gcE^~dMOFSXYWqqv6lem|2UH`aa#FV&%;=f8i2fA*T#Zk*a}a`fEaasH{kX#Oc~
znR7k}@nMJ~AwCLmG{mtG$CJ)aBu<3*IK(F*PHtoTU&HtBVDh5z3r|;K<NSAKCl}Xs
z|H7@Kr+0Ba000000000000000008|H|6{*DDHJPD_lw0!rE?GO!^v<l%~qSAE@Z97
zeCJ--e|Jj5g~i5v{aWR6b15BY>cB3=I^SIXPfDHo2XewK{~^EBKjfGChx}6ikYDN_
z@=N_geyM-RFZB=krT!tm)Ia2x`iI;qC7mhYok1r8^jYyie7<CiyURECJ=?l>&%HQ3
zw4Y@f+gI!9Vxx7f&p86y(Q3?PjfKTVeg0x=DI%M_QlD#HT$yM!(wW(M8V)umR;#h!
sWIau@^1@2CR9>9^YI<sT(217;(gE1B@Dlz448U9Le-nREQ2-ba0Qog-5dZ)H

diff --git a/test/images/volumes-tester/iscsi/create_block.sh b/test/images/volumes-tester/iscsi/create_block.sh
index 0fe90f7167..2fbc61faca 100755
--- a/test/images/volumes-tester/iscsi/create_block.sh
+++ b/test/images/volumes-tester/iscsi/create_block.sh
@@ -33,8 +33,9 @@ cleanup()
 
 trap cleanup TERM EXIT
 
-# Create 1MB device with ext2
-dd if=/dev/zero of=block count=1 bs=1M
+# Create 120MB device with ext2
+# (volume_io tests need at least 100MB)
+dd if=/dev/zero of=block seek=120 count=1 bs=1M
 mkfs.ext2 block
 
 # Add index.html to it
diff --git a/test/images/volumes-tester/iscsi/run_iscsid.sh b/test/images/volumes-tester/iscsi/run_iscsid.sh
index 767f48d077..2720287745 100755
--- a/test/images/volumes-tester/iscsi/run_iscsid.sh
+++ b/test/images/volumes-tester/iscsi/run_iscsid.sh
@@ -16,16 +16,26 @@
 
 function start()
 {
+    # targetcli need dbus
+    mkdir /run/dbus
+    dbus-daemon  --system
+
+    # clear any previous configuration
+    targetcli clearconfig confirm=True
+
+    # restore configuration from saveconfig.json
     targetcli restoreconfig
-    iscsid
+
+    # maximum log level
+    iscsid -f -d 8
+
     echo "iscsid started"
 }
 
 function stop()
 {
     echo "Stopping iscsid"
-
-    kill $( cat /var/run/iscsid.pid )
+    killall iscsid
     targetcli clearconfig confirm=True
 
     echo "iscsid stopped"
diff --git a/test/images/volumes-tester/iscsi/saveconfig.json b/test/images/volumes-tester/iscsi/saveconfig.json
index 7520b99e53..4efc14c8a2 100644
--- a/test/images/volumes-tester/iscsi/saveconfig.json
+++ b/test/images/volumes-tester/iscsi/saveconfig.json
@@ -32,7 +32,7 @@
       "dev": "block",
       "name": "block",
       "plugin": "fileio",
-      "size": 1048576,
+      "size": 126877696,
       "write_back": true,
       "wwn": "521c57aa-9d9b-4e5d-ab1a-527487f92a33"
     }
diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index 85b0e5fd5d..dae027c326 100644
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -94,7 +94,7 @@ var (
 	ServeHostname       = ImageConfig{e2eRegistry, "serve-hostname", "1.0", true}
 	TestWebserver       = ImageConfig{e2eRegistry, "test-webserver", "1.0", true}
 	VolumeNFSServer     = ImageConfig{gcRegistry, "volume-nfs", "0.8", false}
-	VolumeISCSIServer   = ImageConfig{gcRegistry, "volume-icsci", "0.1", false}
+	VolumeISCSIServer   = ImageConfig{gcRegistry, "volume-iscsi", "0.2", false}
 	VolumeGlusterServer = ImageConfig{gcRegistry, "volume-gluster", "0.2", false}
 	VolumeCephServer    = ImageConfig{gcRegistry, "volume-ceph", "0.1", false}
 	VolumeRBDServer     = ImageConfig{gcRegistry, "volume-rbd", "0.1", false}