mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
Code Issues Releases Activity

net/kafka: fix regression in non-Kraft mode after update to 3.3.1

Browse Source 
"There's a regression after update to 3.3.1 in non-Kraft mode
The port always creates /var/db/kafka/kraft dir. But it brokes the Kafka environment."

PR:	267309
Approved by: rene
Differential Revision: https://reviews.freebsd.org/D37731
This commit is contained in:
Pavel Timofeev 2022-12-18 10:31:11 +01:00 committed by Ronald Klop
parent 88def9be56
commit 93b244dc10
No known key found for this signature in database
GPG Key ID: 551E8E6207A42166
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/kafka/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= kafka
DISTVERSION= 3.3.1
PORTREVISION= 1
CATEGORIES= net java
MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION}/
DISTNAME= ${PORTNAME}_2.13-${PORTVERSION}
@ -27,6 +28,7 @@ SHEBANG_FILES= bin/*.sh
KAFKA_USER?= kafka
KAFKA_GROUP?= kafka
KAFKA_DBDIR?= /var/db/${PORTNAME}
KAFKA_DBDIR_KRAFT?= ${KAFKA_DBDIR}-kraft
KAFKA_LOGDIR?= /var/log/${PORTNAME}
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
@ -39,7 +41,8 @@ SUB_LIST= JAVA=${JAVA} \
KAFKA_USER=${KAFKA_USER} \
KAFKA_GROUP=${KAFKA_GROUP} \
KAFKA_LOGDIR=${KAFKA_LOGDIR} \
KAFKA_DBDIR=${KAFKA_DBDIR}
KAFKA_DBDIR=${KAFKA_DBDIR} \
KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT}
USERS= ${KAFKA_USER}
GROUPS= ${KAFKA_GROUP}
@ -66,13 +69,14 @@ KAFKA_CONFIGS= connect-console-sink.properties \
connect-mirror-maker.properties connect-standalone.properties \
consumer.properties log4j.properties producer.properties \
server.properties tools-log4j.properties trogdor.conf
KAFKA_KRAFT= broker.properties controller.properties server.properties
KAFKA_CONFIGS_KRAFT= broker.properties controller.properties server.properties
PLIST_SUB= PORTVERSION=${PORTVERSION} \
KAFKA_USER=${KAFKA_USER} \
KAFKA_GROUP=${KAFKA_GROUP} \
KAFKA_LOGDIR=${KAFKA_LOGDIR} \
KAFKA_DBDIR=${KAFKA_DBDIR}
KAFKA_DBDIR=${KAFKA_DBDIR} \
KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT}
OPTIONS_DEFINE= DOCS
@ -82,15 +86,15 @@ post-patch:
@${REINPLACE_CMD} "s|\$$base_dir.*/config|${ETCDIR}|" ${WRKSRC}/bin/*.sh
@${REINPLACE_CMD} "s|ps ax|ps axww|" ${WRKSRC}/bin/kafka-server-stop.sh
@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}|" ${WRKSRC}/config/server.properties
.for f in ${KAFKA_KRAFT}
@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}/kraft/|" ${WRKSRC}/config/kraft/${f}
.for f in ${KAFKA_CONFIGS_KRAFT}
@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR_KRAFT}|" ${WRKSRC}/config/kraft/${f}
.endfor
do-install:
${MKDIR} ${STAGEDIR}${ETCDIR}
${MKDIR} ${STAGEDIR}${ETCDIR}/kraft
${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}
${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}/kraft
${MKDIR} ${STAGEDIR}${KAFKA_DBDIR_KRAFT}
${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR}
${MKDIR} ${STAGEDIR}${DATADIR}/bin
.for f in ${KAFKA_BINS}
@ -104,7 +108,7 @@ do-install:
.for f in ${KAFKA_CONFIGS}
${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
.endfor
.for f in ${KAFKA_KRAFT}
.for f in ${KAFKA_CONFIGS_KRAFT}
${INSTALL_DATA} ${WRKSRC}/config/kraft/${f} ${STAGEDIR}${ETCDIR}/kraft/${f}.sample
.endfor

2
net/kafka/pkg-plist
View File

@ -285,5 +285,5 @@
@sample %%ETCDIR%%/kraft/controller.properties.sample
@sample %%ETCDIR%%/kraft/server.properties.sample
@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%
@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%/kraft
@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR_KRAFT%%
@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_LOGDIR%%