fix: Only update space once you've got a snapshot_count of >0

brimdata · Apr 14, 2020 · 01d9d31 · 01d9d31
1 parent 0ee067a
commit 01d9d31
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/js/flows/ingestFiles.js b/src/js/flows/ingestFiles.js
@@ -117,22 +117,28 @@ const trackProgress = (client, dispatch, clusterId) => {
  dispatch(Spaces.setIngestProgress(clusterId, name, n))
  }
 
+ async function updateSpaceDetails() {
+ dispatch(Spaces.setDetail(clusterId, await client.spaces.get(name)))
+ }
+
  function toPercent(status): number {
  if (status.packet_total_size === 0) return 1
  else return status.packet_read_size / status.packet_total_size
  }
 
  setProgress(0)
  for await (let {type, ...status} of stream) {
- if (type === "PacketPostStatus") {
- setProgress(toPercent(status))
- dispatch(Spaces.setDetail(clusterId, await client.spaces.get(name)))
- }
- if (type === "LogPostStatus") {
- dispatch(Spaces.setDetail(clusterId, await client.spaces.get(name)))
- }
- if (type === "TaskEnd" && status.error) {
- throw errors.pcapIngest(status.error.error)
+ switch (type) {
+ case "PacketPostStatus":
+ setProgress(toPercent(status))
+ if (status.snapshot_count > 0) updateSpaceDetails()
+ break
+ case "LogPostStatus":
+ updateSpaceDetails()
+ break
+ case "TaskEnd":
+ if (status.error) throw errors.pcapIngest(status.error.error)
+ break
  }
  }
  setProgress(1)

diff --git a/src/js/flows/ingestFiles.test.js b/src/js/flows/ingestFiles.test.js
@@ -23,6 +23,7 @@ let mockClient = {
  yield {type: "TaskStart"}
  yield {
  type: "PacketPostStatus",
+ snapshot_count: 1,
  start_time: {sec: 0, ns: 0},
  update_time: {sec: 1, ns: 1},
  packet_total_size: 100,