xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2678 fix for sbn retrieval agent subscription queue. init it as null because sbn ingest is from ingest messages.

Browse source 
Amend: Because of the files used specifically for InMemoryBandwidthManagerManager, added the SBN RetrievalPlan back to WFO.

Change-Id: Ibebd89a2dd0236c47e8060489eb67bec9fc8d583

Former-commit-id: b3f9678dba [formerly e308f2a6ee] [formerly b3f9678dba [formerly e308f2a6ee] [formerly ee4dc7068b [formerly b0c2fcb5e802815b886f669b633e516b022b55a3]]]
Former-commit-id: ee4dc7068b
Former-commit-id: 3f4785f450 [formerly 31705fddf5]
Former-commit-id: 7bb44e47ba
This commit is contained in:
Brad Gonzales 2014-01-16 14:07:18 -06:00
parent 938f0c0b07
commit d2629887bf
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl-wfo.xml
View file

@ -61,9 +61,7 @@
<constructor-arg ref="bandwidthDao" />
<constructor-arg ref="retrievalDao" />
<constructor-arg ref="ProviderHandler" />
<constructor-arg name="retrievalQueue" >
<null/>
</constructor-arg>
<constructor-arg ref="retrievalQueue" />
</bean>
<util:map id="retrievalAgents">

19
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo.xml
View file

@ -16,10 +16,29 @@
</property>
</bean>
<!-- SBN Retrival Plans are defined in the wfo configuration because it is used by the
InMemoryBandwidthManager in the centralRegistry and client registries. They are not
scheduled in the client registries though -->
<bean id="SBNRetrievalPlan"
class="com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.RetrievalPlan">
<property name="network" value="SBN" />
<property name="map" ref="BandwidthMap" />
<property name="bandwidthDao" ref="bandwidthDao" />
<property name="bucketsDao" ref="bandwidthBucketDao" />
<property name="associator" ref="bandwidthBucketAllocationAssociator" />
<property name="scheduler">
<bean
class="com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.PriorityRetrievalScheduler" />
</property>
</bean>
<util:map id="retrievalPlans">
<entry key="OPSNET">
<ref local="OPSNETRetrievalPlan" />
</entry>
<entry key="SBN">
<ref local="SBNRetrievalPlan" />
</entry>
</util:map>
</beans>

7
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/SubscriptionRetrievalAgent.java
View file

@ -88,7 +88,12 @@ public class SubscriptionRetrievalAgent extends
this.bandwidthDao = bandwidthDao;
this.retrievalDao = retrievalDao;
this.providerHandler = providerHandler;
this.retrievalQueue = retrievalQueue;
// SBN retrievals come from ingest processing
if (network.equals(Network.SBN)) {
this.retrievalQueue = null;
} else {
this.retrievalQueue = retrievalQueue;
}
}
@Override