update Makefile.gstlal_feature_extractor_online to produce a separate kafka...

update Makefile.gstlal_feature_extractor_online to produce a separate kafka dag targetted at dedicated nodesw

gstlal-burst/bin/gstlal_ll_feature_extractor_pipe

@@ -220,7 +220,7 @@ for dir_ in ('features', 'synchronizer', 'monitor', 'aggregator', 'logs'):
 # set up dag and job classes
 #
 
-dag = dagparts.DAG("%s_%s_fx_pipe"%(options.tag, ifo))
+dag = dagparts.DAG("%s_feature_extraction_pipe" % ifo)
 
 # feature extractor job
 if options.condor_universe == 'local':

gstlal-burst/share/feature_extractor/Makefile.gstlal_feature_extractor_online

@@ -130,10 +130,16 @@ DATABASE_NAME = $(IFO)_gstlal_features
 # kafka options
 KAFKA_TOPIC = gstlal_features
 KAFKA_GROUP = feature_production_online
+KAFKA_PORT = 9182
+ZOOKEEPER_PORT = 2271
 ifeq ($(IFO),H1)
-	KAFKA_SERVER:=10.21.6.226:9182
+	KAFKA_SERVER:=10.21.6.226
+	TARGET_MACHINE:=TARGET.Machine
+	NODE:=node502.dcs.ligo-wa.caltech.edu
 else
-	KAFKA_SERVER:=10.13.5.53:9182
+	KAFKA_SERVER:=10.9.11.227
+	TARGET_MACHINE:=Machine
+	NODE:=node227.ldas.ligo-la.caltech.edu
 endif
 
 # synchronizer/file sink options (kafka only)
@@ -185,10 +191,11 @@ GSTLALSHAREDIR=$(LAL_PATH)/../git/gstlal/gstlal-burst/share
 # Workflow #
 ############
 
-all : dag
-	@echo "Submit with: condor_submit_dag feature_extractor_pipe.dag"
+all : online-dag
+	@echo "launch kafka dag first: condor_submit_dag kafka_broker_$(TAG).dag"
+	@echo "then launch online jobs: condor_submit_dag $(IFO)_feature_production_pipe.dag"
 
-dag : $(CHANNEL_LIST) feature_extraction_monitor.yml online-web-deploy
+online-dag : kafka_broker_$(TAG).dag $(CHANNEL_LIST) online-web-deploy
 	gstlal_ll_feature_extractor_pipe \
 		--data-source $(DATA_SOURCE) \
 		--shared-memory-partition H1=LHO_RedDtchr \
@@ -232,10 +239,23 @@ dag : $(CHANNEL_LIST) feature_extraction_monitor.yml online-web-deploy
 		--verbose \
 		--disable-web-service ; \
 
-online-web-deploy : feature_extraction_monitor.yml
-	scald deploy -c feature_extraction_monitor.yml -o ~/public_html -e
+kafka_broker_$(TAG).dag : feature_extraction_monitor_$(IFO).yml
+	gstlal_kafka_dag \
+		--analysis-tag $(TAG) \
+		--kafka-hostname $(KAFKA_HOSTNAME) \
+		--kafka-port $(KAFKA_PORT) \
+		--zookeeper-port $(ZOOKEEPER_PORT) \
+		--analysis-tag $(TAG) \
+		--condor-universe $(CONDOR_UNIVERSE) \
+		--condor-command=accounting_group=$(ACCOUNTING_TAG) \
+		--condor-command=accounting_group_user=$(GROUP_USER) \
+		--condor-command='Requirements=(TARGET.HasLowLatencyDetcharFrames =?= True) && ($(TARGET_MACHINE) == "$(NODE)")' \
+		$(CONDOR_COMMANDS) \
+
+online-web-deploy : feature_extraction_monitor_$(IFO).yml
+	scald deploy -c feature_extraction_monitor_$(IFO).yml -o ~/public_html -e -n $(IFO)_feature_extraction_monitor
 
-feature_extraction_monitor.yml :
+feature_extraction_monitor_$(IFO).yml :
 	cp $(GSTLALSHAREDIR)/feature_extractor/monitoring/$@ .
 
 # Pull latest channel list
@@ -253,4 +273,4 @@ clean :
 	-rm -rvf *.sub *.dag* *.cache *.sh logs *.ini *.txt
 
 clean-all :
-	-rm -rvf *.sub *.dag* *.cache *.sh logs *.ini *.txt monitor aggregator features snapshots synchronizer gstlal_feature_*
+	-rm -rvf *.sub *.dag* *.cache *.sh logs *.ini *.txt monitor aggregator features snapshots synchronizer gstlal_feature_* kafka* zookeeper*