With traces
This commit is contained in:
Родитель
626edb2707
Коммит
924635e377
|
@ -87,6 +87,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void close() {
|
public void close() {
|
||||||
|
log.warn("Yihezkel: Close ResourceManager start");
|
||||||
timer.cancel();
|
timer.cancel();
|
||||||
timer.purge();
|
timer.purge();
|
||||||
timer = null;
|
timer = null;
|
||||||
|
@ -95,6 +96,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
log.error("Couldn't close client: " + e.getMessage(), e);
|
log.error("Couldn't close client: " + e.getMessage(), e);
|
||||||
}
|
}
|
||||||
|
log.warn("Yihezkel: Close ResourceManager done");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void init() {
|
private void init() {
|
||||||
|
@ -102,6 +104,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
|
log.warn("Yihezkel: RefreshIngestionResourcesTask.run start");
|
||||||
refreshIngestionResources();
|
refreshIngestionResources();
|
||||||
timer.schedule(new RefreshIngestionResourcesTask(), defaultRefreshTime);
|
timer.schedule(new RefreshIngestionResourcesTask(), defaultRefreshTime);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
@ -110,12 +113,14 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
timer.schedule(new RefreshIngestionResourcesTask(), refreshTimeOnFailure);
|
timer.schedule(new RefreshIngestionResourcesTask(), refreshTimeOnFailure);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
log.warn("Yihezkel: RefreshIngestionResourcesTask.run done");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class RefreshIngestionAuthTokenTask extends TimerTask {
|
class RefreshIngestionAuthTokenTask extends TimerTask {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
|
log.warn("Yihezkel: RefreshIngestionAuthTokenTask.run start");
|
||||||
try {
|
try {
|
||||||
refreshIngestionAuthToken();
|
refreshIngestionAuthToken();
|
||||||
timer.schedule(new RefreshIngestionAuthTokenTask(), defaultRefreshTime);
|
timer.schedule(new RefreshIngestionAuthTokenTask(), defaultRefreshTime);
|
||||||
|
@ -125,6 +130,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
timer.schedule(new RefreshIngestionAuthTokenTask(), refreshTimeOnFailure);
|
timer.schedule(new RefreshIngestionAuthTokenTask(), refreshTimeOnFailure);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
log.warn("Yihezkel: RefreshIngestionAuthTokenTask.run done");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -156,6 +162,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getIdentityToken() throws IngestionServiceException, IngestionClientException {
|
public String getIdentityToken() throws IngestionServiceException, IngestionClientException {
|
||||||
|
log.warn("Yihezkel: getIdentityToken start");
|
||||||
if (identityToken == null) {
|
if (identityToken == null) {
|
||||||
refreshIngestionAuthToken();
|
refreshIngestionAuthToken();
|
||||||
try {
|
try {
|
||||||
|
@ -167,6 +174,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
authTokenLock.readLock().unlock();
|
authTokenLock.readLock().unlock();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
log.warn("Yihezkel: getIdentityToken done");
|
||||||
return identityToken;
|
return identityToken;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,6 +187,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
private <T> IngestionResource<T> getResourceSet(Callable<IngestionResource<T>> resourceGetter) throws IngestionClientException, IngestionServiceException {
|
private <T> IngestionResource<T> getResourceSet(Callable<IngestionResource<T>> resourceGetter) throws IngestionClientException, IngestionServiceException {
|
||||||
|
log.warn("Yihezkel: getResourceSet start");
|
||||||
IngestionResource<T> resource = null;
|
IngestionResource<T> resource = null;
|
||||||
try {
|
try {
|
||||||
resource = resourceGetter.call();
|
resource = resourceGetter.call();
|
||||||
|
@ -204,6 +213,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log.warn("Yihezkel: getResourceSet done");
|
||||||
return resource;
|
return resource;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -239,6 +249,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void refreshIngestionResourcesImpl() throws IngestionClientException, IngestionServiceException {
|
private void refreshIngestionResourcesImpl() throws IngestionClientException, IngestionServiceException {
|
||||||
|
log.warn("Yihezkel: RefreshIngestionResourcesTask.refreshIngestionResources start");
|
||||||
// Here we use tryLock(): If there is another instance doing the refresh, then just skip it.
|
// Here we use tryLock(): If there is another instance doing the refresh, then just skip it.
|
||||||
if (ingestionResourcesLock.writeLock().tryLock()) {
|
if (ingestionResourcesLock.writeLock().tryLock()) {
|
||||||
try {
|
try {
|
||||||
|
@ -268,6 +279,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
throw new IngestionClientException(e.getMessage(), e);
|
throw new IngestionClientException(e.getMessage(), e);
|
||||||
} finally {
|
} finally {
|
||||||
ingestionResourcesLock.writeLock().unlock();
|
ingestionResourcesLock.writeLock().unlock();
|
||||||
|
log.warn("Yihezkel: RefreshIngestionResourcesTask.refreshIngestionResources done");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -305,6 +317,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void refreshIngestionAuthTokenImpl() throws IngestionClientException, IngestionServiceException {
|
private void refreshIngestionAuthTokenImpl() throws IngestionClientException, IngestionServiceException {
|
||||||
|
log.warn("Yihezkel: RefreshIngestionAuthTokenTask.refreshIngestionAuthToken start");
|
||||||
if (authTokenLock.writeLock().tryLock()) {
|
if (authTokenLock.writeLock().tryLock()) {
|
||||||
try {
|
try {
|
||||||
log.info("Refreshing Ingestion Auth Token");
|
log.info("Refreshing Ingestion Auth Token");
|
||||||
|
@ -318,6 +331,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
resultTable.next();
|
resultTable.next();
|
||||||
identityToken = resultTable.getString(0);
|
identityToken = resultTable.getString(0);
|
||||||
}
|
}
|
||||||
|
log.info("Refreshing Ingestion Auth Token Finished");
|
||||||
} catch (DataServiceException e) {
|
} catch (DataServiceException e) {
|
||||||
throw new IngestionServiceException(e.getIngestionSource(), "Error refreshing IngestionAuthToken. " + e.getMessage(), e);
|
throw new IngestionServiceException(e.getIngestionSource(), "Error refreshing IngestionAuthToken. " + e.getMessage(), e);
|
||||||
} catch (DataClientException e) {
|
} catch (DataClientException e) {
|
||||||
|
@ -326,6 +340,7 @@ class ResourceManager implements Closeable, IngestionResourceManager {
|
||||||
throw new IngestionClientException(e.getMessage(), e);
|
throw new IngestionClientException(e.getMessage(), e);
|
||||||
} finally {
|
} finally {
|
||||||
authTokenLock.writeLock().unlock();
|
authTokenLock.writeLock().unlock();
|
||||||
|
log.warn("Yihezkel: RefreshIngestionAuthTokenTask.refreshIngestionAuthToken done");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -124,6 +124,8 @@ class E2ETest {
|
||||||
|
|
||||||
@AfterAll
|
@AfterAll
|
||||||
public static void tearDown() {
|
public static void tearDown() {
|
||||||
|
System.out.printf(
|
||||||
|
"Yihezkel: Tearing down, to see whether this method is the cause vs is only called because of the timeout with a different underlying issue");
|
||||||
try {
|
try {
|
||||||
queryClient.executeToJsonResult(databaseName, String.format(".drop table %s ifexists", tableName));
|
queryClient.executeToJsonResult(databaseName, String.format(".drop table %s ifexists", tableName));
|
||||||
ingestClient.close();
|
ingestClient.close();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче