Merge branch 'develop'

CMakeLists.txt

@@ -29,7 +29,7 @@ set(CMAKE_MODULE_PATH
 
 set(VERSION_MAJOR 3)
 set(VERSION_MINOR 8)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 set(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 # Generate include header with the version string

packaging/rpm/fts.spec

@@ -9,7 +9,7 @@
 %endif
 
 Name:       fts
-Version:    3.8.0
+Version:    3.8.1
 Release:    1%{?dist}
 Summary:    File Transfer Service V3
 Group:      System Environment/Daemons

src/db/mysql/MySqlAPI.cpp

@@ -2070,7 +2070,7 @@ void MySqlAPI::cancelExpiredJobsForVo(std::vector<std::string>& jobs, int maxTim
 
         // Cancel jobs using their own timeout
         soci::rowset<std::string> rs = (sql.prepare
-            << "SELECT job_id FROM t_job WHERE "
+            << "SELECT job_id FROM t_job USE INDEX(idx_jobfinished)  WHERE "
             "    max_time_in_queue IS NOT NULL AND max_time_in_queue < unix_timestamp() AND vo_name = :vo "
             "    AND job_state IN ('SUBMITTED', 'ACTIVE', 'STAGING') and job_finished is NULL ", soci::use(vo));
             sql.begin();
@@ -2695,7 +2695,7 @@ void MySqlAPI::updateStagingState(const std::vector<MinFileStatus>& stagingOpsSt
 }
 
 
-static std::string int2str(int v) {
+static std::string int2str(uint64_t v) {
     return boost::lexical_cast<std::string>(v);
 }
 

src/url-copy/UrlCopyProcess.cpp

@@ -202,7 +202,7 @@ static std::string setupMacaroon(const std::string &url, const std::string &prox
     char *err = NULL;
     char *token = (*g_x509_macaroon_issuer_retrieve_p)(url.c_str(),
                                                      proxy.c_str(), proxy.c_str(),
-                                                     2,
+                                                     180,
                                                      &activity_list[0],
                                                      &err);
     if (token)