Skip to content

Commit

Permalink
Fix NPE in httpd service
Browse files Browse the repository at this point in the history 
The patch fixes the following NPE:

17 nov. 2014 11:52:48 (poolCollector) [] RuntimeException while executing runnable com.google.common.util.concurrent.Futures$5@2437e8e6 with executor com.google.common.util.concurrent.MoreExecuto
rs$SameThreadExecutorService@3f726b8a
java.lang.NullPointerException: null
        at java.util.TreeMap.rotateLeft(TreeMap.java:2220) ~[na:1.8.0_25]
        at java.util.TreeMap.fixAfterInsertion(TreeMap.java:2287) ~[na:1.8.0_25]
        at java.util.TreeMap.put(TreeMap.java:582) ~[na:1.8.0_25]
        at diskCacheV111.services.web.PoolCellQueryContainer.put(PoolCellQueryContainer.java:57) ~[dcache-core-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at diskCacheV111.services.web.PoolInfoObserverV3$2.onSuccess(PoolInfoObserverV3.java:140) ~[dcache-core-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at diskCacheV111.services.web.PoolInfoObserverV3$2.onSuccess(PoolInfoObserverV3.java:134) ~[dcache-core-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at com.google.common.util.concurrent.Futures$5.run(Futures.java:1231) ~[guava-17.0.jar:na]
        at com.google.common.util.concurrent.MoreExecutors$SameThreadExecutorService.execute(MoreExecutors.java:297) [guava-17.0.jar:na]
        at com.google.common.util.concurrent.ExecutionList.executeListener(ExecutionList.java:156) [guava-17.0.jar:na]
        at com.google.common.util.concurrent.ExecutionList.execute(ExecutionList.java:145) [guava-17.0.jar:na]
        at com.google.common.util.concurrent.AbstractFuture.set(AbstractFuture.java:185) [guava-17.0.jar:na]
        at org.dcache.cells.CellStub$CallbackFuture.set(CellStub.java:594) [dcache-core-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at org.dcache.cells.CellStub$CallbackFuture.answerArrived(CellStub.java:616) [dcache-core-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at dmg.cells.nucleus.CellNucleus$CallbackTask.innerRun(CellNucleus.java:1050) [cells-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at dmg.cells.nucleus.CellNucleus$AbstractNucleusTask.run(CellNucleus.java:1005) [cells-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at com.google.common.util.concurrent.MoreExecutors$SameThreadExecutorService.execute(MoreExecutors.java:297) [guava-17.0.jar:na]
        at dmg.cells.nucleus.CellNucleus.addToEventQueue(CellNucleus.java:813) [cells-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at dmg.cells.nucleus.CellGlue.sendMessage(CellGlue.java:557) [cells-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at dmg.cells.nucleus.CellNucleus.sendMessage(CellNucleus.java:371) [cells-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at dmg.cells.nucleus.CellAdapter.messageArrived(CellAdapter.java:831) [cells-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at dmg.cells.nucleus.CellNucleus$DeliverMessageTask.innerRun(CellNucleus.java:1095) [cells-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at dmg.cells.nucleus.CellNucleus$AbstractNucleusTask.run(CellNucleus.java:1005) [cells-2.12.0-SNAPSHOT.jar:2.12.0-SNAPSHOT]
        at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) [na:1.8.0_25]
        at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) [na:1.8.0_25]
        at java.lang.Thread.run(Thread.java:745) [na:1.8.0_25]

The patch also changes a few return types from Set to List, as the code
is more concerned about the ordering that uniqueness (and the items in
the list are still unique). Changed a TreeMap to a more efficient
HashMap.

Target: trunk
Request: 2.11
Request: 2.10
Request: 2.9
Require-notes: yes
Require-book: no
Acked-by: Paul Millar <paul.millar@desy.de>
Acked-by: Karsten Schwank <karsten.schwank@desy.de>
Patch: https://rb.dcache.org/r/7510/
  • Loading branch information
@gbehrmann
gbehrmann committed Nov 19, 2014
1 parent 19d6b12 commit 5ee36f2
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 32 deletions.
31 changes: 14 additions & 17 deletions modules/dcache/src/main/java/diskCacheV111/services/web/PoolCellQueryContainer.java
View file
Expand Up @@ -2,7 +2,11 @@

package diskCacheV111.services.web;

import com.google.common.collect.Ordering;

import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
Expand Down Expand Up @@ -48,40 +52,39 @@ public boolean isOk()
public class PoolCellQueryContainer implements Serializable
{
private static final long serialVersionUID = 1883299694718571158L;
private SortedMap<String,PoolCellQueryInfo> _infoMap =
new TreeMap<>();
private Map<String,PoolCellQueryInfo> _infoMap = new HashMap<>();
private Map<String,Map<String,Map<String,Object>>> _topology;

public void put(String name, PoolCellQueryInfo info)
public synchronized void put(String name, PoolCellQueryInfo info)
{
_infoMap.put(name, info);
}

public PoolCellQueryInfo getInfoByName(String name)
public synchronized PoolCellQueryInfo getInfoByName(String name)
{
return _infoMap.get(name);
}

public void setTopology(Map<String,Map<String,Map<String,Object>>> topology)
public synchronized void setTopology(Map<String,Map<String,Map<String,Object>>> topology)
{
_topology = topology;
}

public Set<String> getPoolClassSet()
public synchronized List<String> getPoolClasses()
{
return _topology.keySet();
return Ordering.natural().sortedCopy(_topology.keySet());
}

public Set<String> getPoolGroupSetByClassName(String className)
public synchronized List<String> getPoolGroupSetByClassName(String className)
{
Map<String, Map<String, Object>> map = _topology.get(className);
if (map == null) {
return null;
}
return map.keySet();
return Ordering.natural().sortedCopy(map.keySet());
}

public Map<String,Object>
public synchronized Map<String,Object>
getPoolMap(String className, String groupName)
{
Map<String, Map<String, Object>> groupMap =
Expand All @@ -94,13 +97,7 @@ public Set<String> getPoolGroupSetByClassName(String className)
return groupMap.get(groupName);
}

public Map<String,Map<String,Map<String,Object>>>
getTopology()
{
return _topology;
}

public String toString()
public synchronized String toString()
{
StringBuilder sb = new StringBuilder();

Expand Down
24 changes: 12 additions & 12 deletions modules/dcache/src/main/java/diskCacheV111/services/web/PoolInfoObserverEngineV2.java
View file
Expand Up @@ -6,8 +6,8 @@
import java.io.PrintWriter;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;

Expand Down Expand Up @@ -173,37 +173,37 @@ private void printCells(HTMLWriter html, Map<String, Object> poolMap)

private void printClassMenu(HTMLWriter pw, String className)
{
Set<String> classSet = _container.getPoolClassSet();
List<String> classes = _container.getPoolClasses();
pw.println("<h3>Pool Views</h3>");
printMenuTable(pw, classSet, "/pools/list/", className);
printMenuTable(pw, classes, "/pools/list/", className);
}

private void printGroupMenu(HTMLWriter pw, String className, String groupName)
{
Set<String> groupSet =
List<String> groups =
_container.getPoolGroupSetByClassName(className);

if (groupSet != null) {
if (groups != null) {
pw.println("<h3>Pool groups of <emph>"
+ className + "</emph></h3>");
printMenuTable(pw, groupSet,
printMenuTable(pw, groups,
"/pools/list/" + className + "/", groupName);
}
}

private void printGroupList(HTMLWriter html, String className)
{
Set<String> groupSet =
List<String> groups =
_container.getPoolGroupSetByClassName(className);

if (groupSet != null) {
if (groups != null) {
html.println("<h3>Pool groups of <emph>"
+ className + "</emph></h3>");

SortedMap<String, Collection<Object>> info =
new TreeMap<>();

for (String group : groupSet) {
for (String group : groups) {
info.put(group,
_container.getPoolMap(className, group).values());
}
Expand All @@ -214,15 +214,15 @@ private void printGroupList(HTMLWriter html, String className)
}
}

private void printMenuTable(HTMLWriter html, Set<?> itemSet,
private void printMenuTable(HTMLWriter html, Collection<?> items,
String linkBase, String currentItem)
{
html.beginTable("menu");
if (!itemSet.isEmpty()) {
if (!items.isEmpty()) {
html.beginRow();

int n = 0;
for (Object o: itemSet) {
for (Object o: items) {
if (n > 0 && (n % _menuColumns) == 0) {
html.endRow();
html.beginRow();
Expand Down
3 changes: 0 additions & 3 deletions modules/dcache/src/main/java/diskCacheV111/services/web/PoolInfoObserverV3.java
View file
Expand Up @@ -5,8 +5,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Nullable;

import java.io.PrintWriter;
import java.util.Map;
import java.util.Set;
Expand All @@ -21,7 +19,6 @@
import dmg.cells.nucleus.CellPath;

import org.dcache.cells.AbstractCell;
import org.dcache.cells.AbstractMessageCallback;
import org.dcache.cells.CellStub;
import org.dcache.cells.Option;
import org.dcache.util.Args;
Expand Down

0 comments on commit 5ee36f2

Please sign in to comment.