Bugfix of NoSuchUniqueId exception occurred in DeferredGroup when resolving tags by ids. (#1410)

qudongfang · manolama · commit 26cc90503c8f · 2018-11-21T11:31:46.000-08:00
Signed-off-by: clarsen &lt;clarsen@yahoo-inc.com&gt;
diff --git a/src/core/Tags.java b/src/core/Tags.java
@@ -19,6 +19,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.stumbleupon.async.DeferredGroupException;
+import net.opentsdb.utils.Exceptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -353,7 +355,7 @@ static String getValue(final TSDB tsdb, final byte[] row,
    * Extracts the value ID of the given tag UD name from the given row key.
    * @param tsdb The TSDB instance to use for UniqueId lookups.
    * @param row The row key in which to search the tag name.
-   * @param name The name of the tag to search in the row key.
+   * @param tag_id The name of the tag to search in the row key.
    * @return The value ID associated with the given tag ID, or null if this
    * tag ID isn't present in this row key.
    */
@@ -404,7 +406,14 @@ static Map<String, String> getTags(final TSDB tsdb,
                                      final byte[] row) throws NoSuchUniqueId {
     try {
       return getTagsAsync(tsdb, row).joinUninterruptibly();
-    } catch (RuntimeException e) {
+    } catch (DeferredGroupException e) {
+      final Throwable ex = Exceptions.getCause(e);
+      if (ex instanceof NoSuchUniqueId) {
+        throw (NoSuchUniqueId)ex;
+      }
+
+      throw new RuntimeException("Should never be here", e);
+    }  catch (RuntimeException e) {
       throw e;
     } catch (Exception e) {
       throw new RuntimeException("Should never be here", e);
@@ -734,6 +743,14 @@ public static HashMap<String, String> resolveIds(final TSDB tsdb,
       return resolveIdsAsync(tsdb, tags).joinUninterruptibly();
     } catch (NoSuchUniqueId e) {
       throw e;
+    } catch (DeferredGroupException e) {
+      final Throwable ex = Exceptions.getCause(e);
+      if (ex instanceof NoSuchUniqueId) {
+        throw (NoSuchUniqueId)ex;
+      }
+      // TODO  process e.results()
+
+      throw new RuntimeException("Shouldn't be here", e);
     } catch (Exception e) {
       throw new RuntimeException("Shouldn't be here", e);
     }
