diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-02-03 10:47:53 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-02-03 10:47:53 +0100 |
commit | 039ae6fbba7556ba0e8128faa74260056c078869 (patch) | |
tree | 9656504e0172fc6786929bc1e9788160039f3231 /vespaclient-container-plugin | |
parent | db04b94cb72b730e437a6ed8968e09adfb0c68e1 (diff) |
Try to differentiate between client and server errors.
Diffstat (limited to 'vespaclient-container-plugin')
2 files changed, 5 insertions, 2 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerRemove.java b/vespaclient-container-plugin/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerRemove.java index c24398388d5..649913d4f1c 100755 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerRemove.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerRemove.java @@ -7,8 +7,10 @@ import com.yahoo.cloud.config.ClusterListConfig; import com.yahoo.cloud.config.SlobroksConfig; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; +import com.yahoo.container.protect.Error; import com.yahoo.document.DocumentId; import com.yahoo.document.config.DocumentmanagerConfig; +import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.feedapi.FeedContext; import com.yahoo.feedapi.MessagePropertyProcessor; import com.yahoo.feedapi.SingleSender; @@ -78,7 +80,7 @@ public class VespaFeedHandlerRemove extends VespaFeedHandlerBase { long millis = getTimeoutMillis(request); boolean completed = sender.waitForPending(millis); if ( ! completed) - response.addError("Timed out after "+millis+" ms waiting for responses"); + response.addError(Error.TIMEOUT, "Timed out after "+millis+" ms waiting for responses"); return response; } diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerRemoveLocation.java b/vespaclient-container-plugin/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerRemoveLocation.java index 2f0526a21ef..04ca6798b4c 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerRemoveLocation.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/feedhandler/VespaFeedHandlerRemoveLocation.java @@ -7,6 +7,7 @@ import com.yahoo.cloud.config.ClusterListConfig; import com.yahoo.cloud.config.SlobroksConfig; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.container.jdisc.HttpResponse; +import com.yahoo.container.protect.Error; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.documentapi.messagebus.protocol.RemoveLocationMessage; import com.yahoo.feedapi.FeedContext; @@ -78,7 +79,7 @@ public class VespaFeedHandlerRemoveLocation extends VespaFeedHandlerBase { long millis = getTimeoutMillis(request); boolean completed = sender.waitForPending(millis); if ( ! completed) - response.addError("Timed out after "+millis+" ms waiting for responses"); + response.addError(Error.TIMEOUT, "Timed out after "+millis+" ms waiting for responses"); return response; } |