From 85b3e90026185ea7270c245e06d931b2e2b31dc7 Mon Sep 17 00:00:00 2001 From: Jay Bryant Date: Tue, 21 May 2019 10:40:28 -0500 Subject: [PATCH] Replacing "master" and "slave" Per a request from Michael Minella, I replaced "master" with "manager" and "slave" with "worker" in the Spring Batch Reference Guide. I heartily concur with replacing terms that have such dark connotations. --- .../asciidoc/images/partitioning-overview.png | Bin 5165 -> 6677 bytes .../asciidoc/images/remote-chunking.png | Bin 6035 -> 7106 bytes spring-batch-docs/asciidoc/jsr-352.adoc | 18 ++--- spring-batch-docs/asciidoc/scalability.adoc | 34 ++++----- .../asciidoc/spring-batch-integration.adoc | 66 +++++++++--------- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/spring-batch-docs/asciidoc/images/partitioning-overview.png b/spring-batch-docs/asciidoc/images/partitioning-overview.png index a9cd82430c7cfad2c088fbd6c2d797b765b50566..9bb4b6285796bb1cfa8ea0dab3b70b295e71544b 100644 GIT binary patch literal 6677 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 literal 5165 zcmc&Yc{o(>zm^kctcR&Ag&DF`VoD+V46aBv8k znHrtq;NXHeI5-zTZUhpjE1-mYI73gF5V#Cp#&#fM5gUus#t0CCAaQYV5CjDwh)+OJ zSOmROOkxKQ4|=z_fS`~NB+ALfCAv$Dlap%)5ASY?z3AOykRT)}h1nyGm621BkyVhE zRlwnJ$fKmBgu!4mH8uAs9a1@Ze7}mC(xD@2S_Yc>Cv=T1PMtbsU|?WsYU<$NU}Ixr zYU@ZiX=m%=ZD~)marUxt@^bbKIeRW3GBT1xBAq{fo=heaiA0}J^0}Z$Pf|1~E;S%3 z;c`k2Iiu)O!rk!r+et}D>FMd&+1bU##qpWt*Ym5cWR&DSY)LPzxqF{dRMSzJP+5~+ z)7sivU0vPK&~X3${W3~-S6A1>#KiFMaDRV)4~xa>Va?6Wt*@^yEiEClx4tMv#3?9} zsbeSyhfq8F;mkZJv18FC>MnPIGbeEdAU$&1G>a&U-d zm>J)EUKSJu zu47E0eJ}=}p%ei0*O!x{YD11I$;0^I=x)VDW=gY;@mANB@iEb(s1MswovK+8Qyxz@ zRtzQMiQiF-iPh_99ezeSC)^=lxdW5);ZdwlGlm3Den$DfW^&$@gDdRd_o`J58uw8P z!hsVXW3KuzxfX`Ct-^!cm&|Ef^K1G(D~EcEYoac!Xjh~gXj=n8EZ2#mPw6{~$>fzC zd0$*Nlj>W2WA}cgIQYI$&H7^JqEdPXqj1EM=3yC~=&k#UBw8nZF0ijC{a#*LxzFKw zJZ&w_RRuwOI5EyxQdr(Vmzyp3{8F!zGUY-K768vkK&(nuss=clQPPz{GJw@j`1bxe_zLYz}ny)_yXg*TGDZxRCd$L>XO29*at?FtiE9o_}#VPYmCkFp0^rg^QF1 z6e=C940>3nEhgSwDh=cf2WM}UcpJ-k!+lASYyI`)l2g+qv_SNSKrz&EstGaR68(B0&NK|L5E3BDl1U0r5zJvJ6$79ZDZ0Y5H^kw2sAXgch#bipLy zvFauFgOIW$HRth`IH>2OxQYZRH@eQ6u87ZQuE5e=`}InTIq++FH%~05Dlb)#_TC~c zqhigx;Y|yA?eI}xT2b@vC2P8{SD6+YehD7Opc%Dt zZT(X0sSk`-Tun=h8Yu(U3t+_yCm*A>c`sb~BMQ8Uh&uCJ>(z*5?l6X)$BJiyS0Ib5$);(I zQhnv@k7Hu+b!pFEEh>Df8ev0tn%&{!(V%RtztwU`6_NxU`kdg%kx09U0}B#EvaEokOfnl+`2^(u#G3jg~?mE$=-H z7(#(BEb09t?>dnh^;Z1i^8u<)?&w_}CU)B$A{ zJ>PB*wKqQQudDRj5&M~%%J-QqBaY3dV@jS5hot}=c8RraL!pPGcpUr_IVm>0=FJLk zYTnrmrz=Gh=yt>GpIZoAm}pjKe&zRGx=Me3`TkKa+e~NI_gWLjw7yCXo3~HPAchuC z_ReoQmvY}-5E+AGnXo6%eV7=V$&iwj<%-Vj@P~ASdKF8X* z@^D;Swe|)S!<-lx$sOI(Z`Aflm}S4k(3tv_zp|uSZD}_E;15!Jb!$EpmFqYP-7J;i zV_I*mMO1$(bdReS_>KmGfP`%o4RzRh%G#aDte(4IW%a3m6^7)rlU0;PQ%|1-UHzx5 zNK-5;TfeELskKFiy#Dp~BTBS#yCq1apf2m|KFW&wZJe8apR65K*6%UlmU7~YX|Ujj zMp1aJtmM~?->>6N><#i`B-yi$>&KB-wj690!`~2s*JV;j&IBAERk6FQMNzF$akG)Q z4_?}K9G`1Yn(p6U@KLCWYE;?3QwY0LfKL6etVb~W7jMOM;G#;o* zfGlz*w|nj9P9`r|xnxzyEIIwOefFR-_53g&5<#@|$?abY!VT-|+4sIO)q*<>jkC3MrQ9n1W3YEl>hc^ zzus#1zmxWizY~KJnqo3254+t4ps{Nu>dLuA*xZQn6ZHFEX8jxdztuDnk&4NqSZTR$ zMPV~FYp^JxMcteyhux4!!th9Bt){0Ag`YJo>|2#Rug;^!?lcr(d~cm**}C`|@0B!v z*XgH!GFlbR>X2yW{pgu-kp4_`bRLYhY!!fqIwYpA%&NW0#39Ww?iTPURqb*F^O}p9 z2vWqd&1sFAo`VOE8MeI3VKdgpk51kAM7X6wctpcha8My&5y7vmALM&VKzx~qr8^WH zCSF<-pMf!eoJg2TpZGehcbn%q(z|GY>u%rG!I7eC$bOIL0IMLBZExKE%+ABX$n07y z&vUkmKBF2B_0fByMR=Zrh`$MFtaZ3)h~D$E(0Z96Vz5GulaI3nPZdVem_cKcYUc z7i{2>dqd0G8?KSUA(?7h-%KUo4J^GuvrJ<}a%Sqd2hwP521a(V=4PbFdD+HLKn9}K zgPLxP7}8kx;8}JSIYZcOfNWenO;r z1R)sn)G)6KIxF)bpb-P4wN0K;2fw=&yxsFiB_y2cHqe2ol;J_^fZt7UFQidw{fHK^|=*@&jLck7kAE!Xl?KcyMs zv9I!1ISSx6#eK$?Yoh!O{XptH(W6DY&};%YEte}xf1%mtHn1Uo-ia}y++$UyubKzo zgIxT47l(Sh9b=R!$1!=uaycjTg*q)r>8~Z;2;#dkop_2o-`f_e!ULlDghO{lfb!d2p z##2o@C73BJT5FckApurc(w?*RfpnDdT~h-6B4Rg*7WQ!=KoDY4{3I3SB<70*OdGlm zF&!yX?p{$E3DZU>J=H!P0`3ePbzp6j;9ekMZ-QinIbffvHl1=FIdS-j4A!lE6(V;c ztS!=ro*gD^r&bu-=z}Tm3fL|eqCO4WOHE`uz3zMRv1ez{_xk=IPu6Ta>1B`Zl(4CL zj#Kxue}gg1Mjb@eAY0pkW;yl-w8DbDJI+z3#$WsQ;}q_B08-DeIY*E?682f^fBH_j zK6x>VJY?DDX2khl?>YYM;^Y4w@V|H6v$KZ9eUV-$QSkT@ayP}nVPVON?~FJgkziOOh~F zVXljkd@NTunXYhO66Rx<;ANJ%LaQplE6mR&b%p2Z6;62}h=K^WswC_>oL!QiRpAO$ zUJ!C!oJ&>^Dka1%a+zC7kW*2FLs^tdMS@pK0IC4zQ51toiNNGUVJZ@QG87S(QB#yw z6cP);Gkgk)jw3#?}&Jdkbx8X{n*1VP|b=Y;3Hnt81jE zV}UU=L}{2CYP+LlLoAehF$#_-$!M&K8(P*)Tgd08urEg5K|{b1B@u}c3o;OKL&06O zg+eS4!3Jnu5g$Fc8(JnhIyxlKKiD7V;^Knybi;YLQpDcg-p9u$BqYSe$ssx- zEF?J4$IIh4?Dbd+i6k58*xNF(7Lv&}GI5S-agOSl4zjs-Z3XQw13Jbn7KprGL1y?ZIiN%>DQva+)Bb8{YNWweE=5!@AD1gKQvu9bus zK94df2{CAjx%D!^vb(#xrKP2&rlzf}t+ceXxv8O)fUm8sEi5c7D=T{yrSUG)ZZb)C zC|-LmO|Lh_=1q*|XwIGKg1eKGlk@ZQJv}``Lqq-j{p4JumB$9(YJHcA-PbF<&iaMV z2G0%-4z{+oR##Wg&dw;!`L7lccI6@}DvrpTT1c~yX>wj-0j~x2m61NIOP{)#O;-D% zm0Qy#nv7-^yRm*QefLU;wbkfDPX#wZKq%xU6teq}A3lEGOB2}=%LW@rZ=LDhv(nLosnDF|%X9oGO!dRbtFEa%NK_Sw;R0K9i_2cb0Mx?~B_gMX}& zhqEyqLlXS(p+zH3+bG5 z`)MpQL+aJ#e{Uw@XrQMLx>K|F<(AA(H@KxrX}j_z_53Cka35{Fr}uX48$2h-qu(s! zDoFf^vVvDgzBX|>-4waZ>icK}DsclDi4pdW8PG7kP@4OcY38n?DC=OKw|oSQF^zxL z^P$6XxyevYW`+C@hLvw+vDOxGy!;q;Bc+OO5QJg*OSrZXlsx%u&c@ zc-W}9Vs%Oj)E`u252`o!sn+{BZg=v&dS7iPBka-rTcd)`O}FR@w+!+d?kGQ#FfErF zZ;Px*3P%~&0cI#MSUVkAY2$FF@OsHl}&A?g)GV3 zpXNVet6J25eV|$@u%}>!WW(dHyEh7or5jf?(cWQU?IO#uRTxo_pp4%zkLvmGS57c?lzOGp7uwR-zY-$b{sVjP|;H;HLGC9E99h2+@9Hr$gR4Twv;ah>1^e#5&D+H!Wrw6Oc&v=OI2MQ4F7FtBG@@G%IG!Wy8QpqST^10MQAz zthN0W4eQh25827|mGOy9SFS3Q?*%nEJd_4)jO&ZY=nDEl(APKmQsPlC6H|FmkKmFC zHlMB9;;&IEym5}udzeDgBiPrPXr(YG*bXd)68Wp~>VKlK6MJaxrSh3Bo+0xXkuh&O zM?9`h4#@$baWKAkABntp9`w&Bl{NNj305N&nHchCl`W6j5MMDr)90%~@U>v_xVT~L zoa+$u&8PN!^n^-Vf{AaS*Tc#Z?ydrrh|!=m7VvT{+S5+maf5NUU!-@U=CwMXJN`&P zyD6O!@f>`nau=tCs95gI%h*flmXo^LwLef6G0`Ymndy#ZP1)jNQn%6$r*Xnst4Vz; z2S|tt=F@5qQ!_Z}kTpS(Cn0pfWXH%n?@6^tDzGeFrn)Km)4$2%q1cz4T@{|F8e9_4 z^m9Db=z5p5YmL2RZjn`j@NV*MhRH>(;F!|}1%Xa!rK2!Ea+>t`3(?BQ?g979RcCyc zkkyqbBKc!s{dNVL^zKHjN#Sr;)!d@60rydBQrcE;d}~dH!?!&#@)*}qoNf5Ur04W` z6&}-&TSgYKLsEn@+QsDp)EYP?F?E9Ps9RC0>Waeq&IvCjE``}F_!{${&rQ95PzD`y zBIlR;oa^Q#uJlf90g%q=xP2XV>{Ksz8-nY0fHN!Z^PH;_Da+txS~ww1+d}c1&e!C> z8WO5M{OCa!r!6+0_0<@v15Cgo{9(p1fUatx^@3?@OCY&clnhqD| zQ-P`=ydV=}C1r3C-X{Q}gN#{;kbqX#4el9B?z;XMDfVF1^OK}Ho~9`b{Q;wqcO zXvGCG8Fv03`~7bR@Shkmnj4Eks&D)m2SxF}2>QJUVM!zrdX0_c|C;;mdGR;#tz3U5 zj<6z<+&DlWLauoEdxwxh`*QJkz>maTZ9lK}KyZX4Y1k`j+BWWewp-yw*&T0x2wKhe zR>z5n%yZRV0>TPu*n2B}?lX&QPnw<Vl)rIik2Z%|6~ zSkUncDc*A9HXd)edwz(%l6VmYawafaSyilver!qo1=a-JqQgO)Z0jzO;v{+fE`oX( zV}Ke$Y6?L8!MPf`>#8+47NAf>$xyQPI}+JYv7R{^vu{Nf)^%h4wl+b35Q!Ofa_0hJ zQ7u+4j&|PVV|itBp7N>01BOL$R#thY6&Y7;ZFvWtJ!J|sF&@6T>!Z&cwV3N4*!w36 zHblSAbJP|9fIWYJT5uPcM0 z2V{rW30bid)Yi?rR*st4a~+b_U%e%(pS|J6c5oH=1`0(e?<0wNs>90>F4DNr1`O1T z&c7amo7>4Af>ae@E90z!yO)j_QwMo1ZM`=nq+!p(oqG1NJ>7V%-mzfq6lSXlc+yMz za_48FA&!gp^rgRUe)%FuzL_F%c5;lciCCu|`pD-F#=N z1CzeZd#3&(wpP&5i!&smXRXr-3eJz--eJDGju_dF$yT@Q<(!fk|K5F2xcnd|@Y-pi zq|Sgrcwp~PC~*^IQ~GOj)}Jo)8mW8LXU~w!q6xoI7dlk7oR!^j&l6lEn`+~>$5|R^ zPn59=o%_6{s8^R!Qj+be>4)=Mjp*mIr!}=ktesOvrZUFE>+y%;^In~~-K!g*7Stv2 zd5_}_-=9S|G^^^!$a?Vbk7jq}?^>U_rIu=>53{yZ9NThJZ8BY~lxkGdEkoa>N?VsS z|Lkjd^7(O_l9Gqg(r7Vyf2`311f4&b5Mhjarusqc$3%gs0WlecnEk0ey7?jM+hc*0Zyk^L=Om~elpNPY ztago-`HMYibD!1(8LWVK#Y2vENzAn!L?_#ABX7%tMZ$xQsZ!PSHL;HlXDIJmEt~l& z9MVhl@BBM(CM{7;XE|S+zq0L;wLIk%$c98FX*J);c5%d3zDnJ7x211isQpttyZmOc zshuIyA&8kq)FoK$6kSkTYI>K_GDG|IMb*al0NoxNfY2dUWNmaKXwwJ_giV zjBzfM=j-7)wupXuEU4h<3DyCIg%=ORVc#ZokwKjfH)b;h*m$(u8iDB6y3(fI&sSr4 zt)U;{f^x*{wW^O2!xX33nuA>~8_Z3UaCiogwOo}iqiG$GXblaQHZb>zYi}2E*r{BP z%WPk%HDU_R3ECRT1lu0o%Lh4!R4e%CrX74a*mI^CfkRIH8v(WJTF_&%N$7zqBRnR4KgBHH8o-YIIqWLfc z>IbFx{Q)uYfYcnjP3cqPpjg#2F6Y+@3BJcujNs`s{DRLi@vil93ZRm7seXZWo}2}A zH$Do4SUoZJxf>Wj_;{H9(*1dmq8dqsXRw;)0@%=GtT4RPbh}BXAnJ1c*HhW{XtVkH zbeWf2-k;_-3xG$lvd~*k>sU*sk#i6)*zl*lea2FvRL2>yz(3 z6Lj4jQ<`NqsqxTblj|xhGh!cMKNz>{VG8Pje%U$?rho2|U?+yP+yZI?1q`bZ@?bXfXQw31{zj=m9i*-qqscDK=LA z#~*s-`3aX#%K^=@K1PBak0^#{`U~i@8~X?l6?X=k$g~y*t4|PvDdk?p(R=NXgffD7 zK6Cj(E`a3NJ=lB#o%FZ*#?(*bI$nRpN;D2=>Nhe#oJ!EK5T3kOr54-%{#Xz~nu1o_ zx?@&qArtgk{-_>q`4os554;B1WK0;c4ehI}`9!_+46K}!$@v>Vbk*W{dh)h4MrtUb zwZ(9807d@e=+Gk3%TFIPJ4nx@L42i0%>3Hnc3cn^etgIlL`&=mX8-iL&|_|~O3;^) zb)BgQF9(uqzb@T>P3cRg;F)_Q<3`gDSa}@aMo!Zjhe+JT=)_0po4@NyZLJ62eHI^S zX3V`L$CH3Lt#pg&vi};2ygcH)B(KCmu)hg@x(hnNQ07OWNf>QVqzX$JL+v?8W@ssT zVyrP3{D8+v=~9V%4@)H9BsEA<*m;fqaS@*ALjy{*@CoeL^X?+g{Q6>hO!76M$%7l{ zQ##9(F1#K1=@5OpO=(@w^I7U3!-A+&tHf?4*D=0?i0>^-)+IrQ*~$4DSvVyC@P*}S z5*Nm5H(RFPA4jWf5w1vJRDDEf`(DXhiwd9}0Hk`R_uNpit_*J^1)Nni3o9G_a) zSzj`uqN~U#;^m z4)b&VVqJ)miS}@IuB`ThuPr8gv_YaWuFCFyE!$G{#~*x%49_%h&lWjBcF&1E@v{pk zcDNJ)3tB%Xe6l{>GIS+QZ4-98aw!C0xEC(sLTEW={;<1 zahB37+Hc&~#}?yVL>x;?we1(XO!@^hh&x5uCl*s*5^Kg@NB%9emar~FVuA{JU8NW3RBt!xpX3FN|ZUv^W4M?Vx@{tR#Nu7;fQv9BY z6UCO{n@OF-4*G3K;4vm3J{53I^QfP&)PO<8!r9@L>^6AKUnmMiF>ZDJMSY40n&CRV zUjU%+Ca1SuIu(deReEPb)`Nr01}aOQvj>^}@ppwnh%BWjA;aNV`CrtD^ouoV|Ds&b zWXhn;|Mj3bn&>e`GpQ9tL&;9@e}~=ujaP*^SSYlZ?c=<``>SYccxoQ-U2^?AoSEV+9H;Tgd+7a)=*QyA zvfw_`vDjExxSJU0psVkFY_izWPV+})aZ5;xIwA{5Rh7zXh2iZleu}IsTL?dx7Cl@Y z(iQni3s>S|nQxglBnl_TV*voU-PV>5AYjd=KFbdSmZE+GkaaH#Jr<@cra41a0<|SM zJ(b`bG#<4|GbTQv8F_&IO!4=98p!7Mt9vOx^f%@paMaJL5x4Mj;2@>F{h(jRW)&pG z_FZTzhjHDzIN1nj7}OzX2WPbMOEF delta 5380 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 PFsZI-8D1^dKtulor + @@ -313,8 +313,8 @@ The following example shows the `PartitionStep` configuration using java configu [source, java, role="javaContent"] ---- @Bean -public Step step1Master() { - return stepBuilderFactory.get("step1.master") +public Step step1Manager() { + return stepBuilderFactory.get("step1.manager") .partitioner("step1", partitioner()) .step(step1()) .gridSize(10) @@ -332,7 +332,7 @@ https://github.com/spring-projects/spring-batch/tree/master/spring-batch-samples Batch Samples] (see `Partition*Job.xml` configuration). Spring Batch creates step executions for the partitions called "step1:partition0", and so -on. Many people prefer to call the master step "step1:master" for consistency. You can +on. Many people prefer to call the manager step "step1:manager" for consistency. You can use an alias for the step (by specifying the `name` attribute instead of the `id` attribute). @@ -367,7 +367,7 @@ following example: [source, xml, role="xmlContent"] ---- - + @@ -386,8 +386,8 @@ as shown in the following example: [source, java, role="javaContent"] ---- @Bean -public Step step1Master() { - return stepBuilderFactory.get("step1.master") +public Step step1Manager() { + return stepBuilderFactory.get("step1.manager") .partitioner("step1", partitioner()) .partitionHandler(partitionHandler()) .build(); diff --git a/spring-batch-docs/asciidoc/spring-batch-integration.adoc b/spring-batch-docs/asciidoc/spring-batch-integration.adoc index 74ba200c9..1b0c6ecd5 100644 --- a/spring-batch-docs/asciidoc/spring-batch-integration.adoc +++ b/spring-batch-docs/asciidoc/spring-batch-integration.adoc @@ -718,12 +718,12 @@ public Job chunkJob() { ---- The `ItemReader` reference points to the bean you want -to use for reading data on the master. The `ItemWriter` reference +to use for reading data on the manager. The `ItemWriter` reference points to a special `ItemWriter` (called `ChunkMessageChannelItemWriter`), as described above. The processor (if any) is left off the -master configuration, as it is configured on the worker. The -following configuration provides a basic master setup. You +manager configuration, as it is configured on the worker. The +following configuration provides a basic manager setup. You should check any additional component properties, such as throttle limits and so on, when implementing your use case. @@ -878,7 +878,7 @@ public org.apache.activemq.ActiveMQConnectionFactory connectionFactory() { } /* - * Configure inbound flow (requests coming from the master) + * Configure inbound flow (requests coming from the manager) */ @Bean public DirectChannel requests() { @@ -894,7 +894,7 @@ public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) } /* - * Configure outbound flow (replies going to the master) + * Configure outbound flow (replies going to the manager) */ @Bean public DirectChannel replies() { @@ -925,7 +925,7 @@ public ChunkProcessorChunkHandler chunkProcessorChunkHandler() { ---- Most of these configuration items should look familiar from the -master configuration. Workers do not need access to +manager configuration. Workers do not need access to the Spring Batch `JobRepository` nor to the actual job configuration file. The main bean of interest is the `chunkProcessorChunkHandler`. The @@ -933,7 +933,7 @@ is the `chunkProcessorChunkHandler`. The configured `SimpleChunkProcessor`, which is where you would provide a reference to your `ItemWriter` (and, optionally, your `ItemProcessor`) that will run on the worker -when it receives chunks from the master. +when it receives chunks from the manager. For more information, see the section of the "Scalability" chapter on link:$$https://docs.spring.io/spring-batch/reference/html/scalability.html#remoteChunking$$[Remote Chunking]. @@ -942,7 +942,7 @@ Starting from version 4.1, Spring Batch Integration introduces the `@EnableBatch annotation that can be used to simplify a remote chunking setup. This annotation provides two beans that can be autowired in the application context: -* `RemoteChunkingMasterStepBuilderFactory`: used to configure the master step +* `RemoteChunkingMasterStepBuilderFactory`: used to configure the manager step * `RemoteChunkingWorkerBuilder`: used to configure the remote worker integration flow These APIs take care of configuring a number of components as described in the following diagram: @@ -950,8 +950,8 @@ These APIs take care of configuring a number of components as described in the f .Remote Chunking Configuration image::{batch-asciidoc}images/remote-chunking-config.png[Remote Chunking Configuration, scaledwidth="80%"] -On the master side, the `RemoteChunkingMasterStepBuilderFactory` allows you to -configure a master step by declaring: +On the manager side, the `RemoteChunkingMasterStepBuilderFactory` lets you +configure a manager step by declaring: * the item reader to read items and send them to workers * the output channel ("Outgoing requests") to send requests to workers @@ -962,10 +962,10 @@ A `ChunkMessageChannelItemWriter` and the `MessagingTemplate` are not needed to On the worker side, the `RemoteChunkingWorkerBuilder` allows you to configure a worker to: -* listen to requests sent by the master on the input channel ("Incoming requests") +* listen to requests sent by the manager on the input channel ("Incoming requests") * call the `handleChunk` method of `ChunkProcessorChunkHandler` for each request with the configured `ItemProcessor` and `ItemWriter` -* send replies on the output channel ("Outgoing replies") to the master +* send replies on the output channel ("Outgoing replies") to the manager There is no need to explicitly configure the `SimpleChunkProcessor` and the `ChunkProcessorChunkHandler` (Those can be explicitly configured if required). @@ -979,14 +979,14 @@ The following example shows how to use these APIs: public class RemoteChunkingJobConfiguration { @Configuration - public static class MasterConfiguration { + public static class ManagerConfiguration { @Autowired - private RemoteChunkingMasterStepBuilderFactory masterStepBuilderFactory; + private RemoteChunkingMasterStepBuilderFactory managerStepBuilderFactory; @Bean - public TaskletStep masterStep() { - return this.masterStepBuilderFactory.get("masterStep") + public TaskletStep managerStep() { + return this.managerStepBuilderFactory.get("managerStep") .chunk(100) .reader(itemReader()) .outputChannel(requests()) // requests sent to workers @@ -1009,8 +1009,8 @@ public class RemoteChunkingJobConfiguration { return this.workerBuilder .itemProcessor(itemProcessor()) .itemWriter(itemWriter()) - .inputChannel(requests()) // requests received from the master - .outputChannel(replies()) // replies sent to the master + .inputChannel(requests()) // requests received from the manager + .outputChannel(replies()) // replies sent to the manager .build(); } @@ -1130,7 +1130,7 @@ configuration: ---- /* - * Configuration of the master side + * Configuration of the manager side */ @Bean public PartitionHandler partitionHandler() { @@ -1239,7 +1239,7 @@ You must also ensure that the partition `handler` attribute maps to the `partiti [source, xml, role="xmlContent"] ---- - + ... @@ -1251,7 +1251,7 @@ You must also ensure that the partition `handler` attribute maps to the `partiti ---- public Job personJob() { return jobBuilderFactory.get("personJob") - .start(stepBuilderFactory.get("step1.master") + .start(stepBuilderFactory.get("step1.manager") .partitioner("step1.worker", partitioner()) .partitionHandler(partitionHandler()) .build()) @@ -1265,7 +1265,7 @@ link:$$https://github.com/spring-projects/spring-batch/tree/master/spring-batch- The `@EnableBatchIntegration` annotation that can be used to simplify a remote partitioning setup. This annotation provides two beans useful for remote partitioning: -* `RemotePartitioningMasterStepBuilderFactory`: used to configure the master step +* `RemotePartitioningMasterStepBuilderFactory`: used to configure the manager step * `RemotePartitioningWorkerStepBuilderFactory`: used to configure the worker step These APIs take care of configuring a number of components as described in the following diagram: @@ -1276,8 +1276,8 @@ image::{batch-asciidoc}images/remote-partitioning-polling-config.png[Remote Part .Remote Partitioning Configuration (with replies aggregation) image::{batch-asciidoc}images/remote-partitioning-aggregation-config.png[Remote Partitioning Configuration (with replies aggregation), scaledwidth="80%"] -On the master side, the `RemotePartitioningMasterStepBuilderFactory` allows you to -configure a master step by declaring: +On the manager side, the `RemotePartitioningMasterStepBuilderFactory` allows you to +configure a manager step by declaring: * the `Partitioner` used to partition data * the output channel ("Outgoing requests") to send requests to workers @@ -1289,9 +1289,9 @@ The `MessageChannelPartitionHandler` and the `MessagingTemplate` are not needed On the worker side, the `RemotePartitioningWorkerStepBuilderFactory` allows you to configure a worker to: -* listen to requests sent by the master on the input channel ("Incoming requests") +* listen to requests sent by the manager on the input channel ("Incoming requests") * call the `handle` method of `StepExecutionRequestHandler` for each request -* send replies on the output channel ("Outgoing replies") to the master +* send replies on the output channel ("Outgoing replies") to the manager There is no need to explicitly configure the `StepExecutionRequestHandler` (which can be explicitly configured if required). @@ -1305,15 +1305,15 @@ The following example shows how to use these APIs: public class RemotePartitioningJobConfiguration { @Configuration - public static class MasterConfiguration { + public static class ManagerConfiguration { @Autowired - private RemotePartitioningMasterStepBuilderFactory masterStepBuilderFactory; + private RemotePartitioningMasterStepBuilderFactory managerStepBuilderFactory; @Bean - public Step masterStep() { - return this.masterStepBuilderFactory - .get("masterStep") + public Step managerStep() { + return this.managerStepBuilderFactory + .get("managerStep") .partitioner("workerStep", partitioner()) .gridSize(10) .outputChannel(outgoingRequestsToWorkers()) @@ -1335,8 +1335,8 @@ public class RemotePartitioningJobConfiguration { public Step workerStep() { return this.workerStepBuilderFactory .get("workerStep") - .inputChannel(incomingRequestsFromMaster()) - .outputChannel(outgoingRepliesToMaster()) + .inputChannel(incomingRequestsFromManager()) + .outputChannel(outgoingRepliesToManager()) .chunk(100) .reader(itemReader()) .processor(itemProcessor())