SwiftTokenCache needs to validate current token is valid

[jjohann]

I wrap COSBench runs with scripts that reconfigure swift without restarting COSBench. Tempauth is being used. With the 0.4.0 release, I run into problems because COSBench wants to use an authentication token that was valid with the previous incarnation of Swift, but will be rejected with the running instance (token is not valid in memcached because memcached has restarted.) I think the solution to this problem is to validate the authentication token by doing a HEAD request to the storageURL with the currently cached authToken. If the HEAD request returns 200, it's OK. Otherwise the driver needs to login again.

I've tried the following patch, but I haven't figured out how to do remote debug with Java/eclipse.:

diff -rupN a/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/SwiftAuthClient.java b/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/SwiftAuthClient.java
--- a/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/SwiftAuthClient.java 2014-09-10 13:40:13.299762883 -0600
+++ b/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/SwiftAuthClient.java 2014-09-11 15:18:29.263687554 -0600
@@ -24,6 +24,7 @@ import java.io.IOException;
 import org.apache.http.*;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpHead;
 import org.apache.http.util.EntityUtils;

 import com.intel.cosbench.client.http.HttpClientUtil;
@@ -84,4 +85,19 @@ public class SwiftAuthClient {
         }
     }

+    public boolean check() {
+       HttpResponse response;
+       try {
+           HttpHead method = new HttpHead(storageURL);
+           method.setHeader(X_AUTH_TOKEN, authToken);
+           response = client.execute(method);
+
+           if ((response.getStatusLine().getStatusCode() >= HttpStatus.SC_OK) &&
+               (response.getStatusLine().getStatusCode() < (HttpStatus.SC_OK + 100)))
+               return true;
+       } catch (IOException e) {
+       }
+        return false;
+    }
+
 }
diff -rupN a/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/utils/SwiftTokenCacheImpl.java b/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/utils/SwiftTokenCacheImpl.java
--- a/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/utils/SwiftTokenCacheImpl.java   2014-09-11 15:23:46.595683303 -0600
+++ b/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/utils/SwiftTokenCacheImpl.java   2014-09-11 15:10:53.639693659 -0600
@@ -40,8 +40,8 @@ public class SwiftTokenCacheImpl {
    }

     public static SwiftTokenCache getSwiftTokenCache(SwiftAuthClient client) {
-       if(latestTokenCache.getVersion()==0)
+       if(latestTokenCache.getVersion()==0 || !client.check())
            loadSwiftTokenCache(client,latestTokenCache);
-               return latestTokenCache;
+        return latestTokenCache;
     }
 }

[ywang19]

Thanks, merged in commit: 36c20b0